diff options
author | Daniel Llorens <daniel.llorens@bluewin.ch> | 2013-04-03 15:40:48 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2013-04-03 21:46:27 +0200 |
commit | 75a1b26c5d06e791afce10be9b1ab4e5272e45b4 (patch) | |
tree | 1813bb74e3cff3ee801624914532e9c75cb6a1bc | |
parent | 7290de89fb5bf755e2520bd01e977dc132c50c4b (diff) | |
download | guile-75a1b26c5d06e791afce10be9b1ab4e5272e45b4.tar.gz |
Deprecate dead code in array-map.c
* libguile/array-map.c, libguile/array-map.h: deprecate scm_ra_eqp,
scm_ra_lessp, scm_ra_leqp, scm_ra_grp, scm_ra_greqp, scm_ra_sum,
scm_ra_product, scm_ra_difference, scm_ra_divide, scm_array_identity.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
-rw-r--r-- | libguile/array-map.c | 5 | ||||
-rw-r--r-- | libguile/array-map.h | 27 |
2 files changed, 19 insertions, 13 deletions
diff --git a/libguile/array-map.c b/libguile/array-map.c index 00a24f150..1dc5d3bca 100644 --- a/libguile/array-map.c +++ b/libguile/array-map.c @@ -396,6 +396,7 @@ SCM_DEFINE (scm_array_copy_x, "array-copy!", 2, 0, 0, /* Functions callable by ARRAY-MAP! */ +#if SCM_ENABLE_DEPRECATED == 1 int scm_ra_eqp (SCM ra0, SCM ras) @@ -637,9 +638,9 @@ scm_array_identity (SCM dst, SCM src) return racp (SCM_CAR (src), scm_cons (dst, SCM_EOL)); } +#endif /* SCM_ENABLE_DEPRECATED */ - -static int +static int ramap (SCM ra0, SCM proc, SCM ras) { long i = SCM_I_ARRAY_DIMS (ra0)->lbnd; diff --git a/libguile/array-map.h b/libguile/array-map.h index 43d2a9281..eb1aa375f 100644 --- a/libguile/array-map.h +++ b/libguile/array-map.h @@ -4,7 +4,7 @@ #define SCM_ARRAY_MAP_H /* Copyright (C) 1995, 1996, 1997, 2000, 2006, 2008, 2009, 2010, - * 2011 Free Software Foundation, Inc. + * 2011, 2013 Free Software Foundation, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -34,22 +34,27 @@ SCM_API int scm_ramapc (void *cproc, SCM data, SCM ra0, SCM lra, SCM_API int scm_array_fill_int (SCM ra, SCM fill, SCM ignore); SCM_API SCM scm_array_fill_x (SCM ra, SCM fill); SCM_API SCM scm_array_copy_x (SCM src, SCM dst); -SCM_API int scm_ra_eqp (SCM ra0, SCM ras); -SCM_API int scm_ra_lessp (SCM ra0, SCM ras); -SCM_API int scm_ra_leqp (SCM ra0, SCM ras); -SCM_API int scm_ra_grp (SCM ra0, SCM ras); -SCM_API int scm_ra_greqp (SCM ra0, SCM ras); -SCM_API int scm_ra_sum (SCM ra0, SCM ras); -SCM_API int scm_ra_difference (SCM ra0, SCM ras); -SCM_API int scm_ra_product (SCM ra0, SCM ras); -SCM_API int scm_ra_divide (SCM ra0, SCM ras); -SCM_API int scm_array_identity (SCM src, SCM dst); SCM_API SCM scm_array_map_x (SCM ra0, SCM proc, SCM lra); SCM_API SCM scm_array_for_each (SCM proc, SCM ra0, SCM lra); SCM_API SCM scm_array_index_map_x (SCM ra, SCM proc); SCM_API SCM scm_array_equal_p (SCM ra0, SCM ra1); SCM_INTERNAL void scm_init_array_map (void); +#if SCM_ENABLE_DEPRECATED == 1 + +SCM_DEPRECATED int scm_ra_eqp (SCM ra0, SCM ras); +SCM_DEPRECATED int scm_ra_lessp (SCM ra0, SCM ras); +SCM_DEPRECATED int scm_ra_leqp (SCM ra0, SCM ras); +SCM_DEPRECATED int scm_ra_grp (SCM ra0, SCM ras); +SCM_DEPRECATED int scm_ra_greqp (SCM ra0, SCM ras); +SCM_DEPRECATED int scm_ra_sum (SCM ra0, SCM ras); +SCM_DEPRECATED int scm_ra_difference (SCM ra0, SCM ras); +SCM_DEPRECATED int scm_ra_product (SCM ra0, SCM ras); +SCM_DEPRECATED int scm_ra_divide (SCM ra0, SCM ras); +SCM_DEPRECATED int scm_array_identity (SCM src, SCM dst); + +#endif /* SCM_ENABLE_DEPRECATED == 1 */ + #endif /* SCM_ARRAY_MAP_H */ /* |