diff options
| author | Andy Wingo <wingo@pobox.com> | 2013-02-18 17:59:38 +0100 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2013-02-18 17:59:38 +0100 |
| commit | 9b977c836bf147d386944c401113aba32776fa68 (patch) | |
| tree | d097e1a2376e26bc6b03447445ae239d5514a7a8 /libguile/inline.h | |
| parent | 180ac9d7b0bac97bdead2813a1b0b23d19002c3e (diff) | |
| parent | 739941679c2c7dc36c29c30aff7d4c1b436ba773 (diff) | |
| download | guile-9b977c836bf147d386944c401113aba32776fa68.tar.gz | |
Merge remote-tracking branch 'origin/stable-2.0'
Conflicts:
libguile/array-handle.c
libguile/deprecated.h
libguile/inline.c
libguile/inline.h
module/ice-9/deprecated.scm
module/language/tree-il/peval.scm
Diffstat (limited to 'libguile/inline.h')
| -rw-r--r-- | libguile/inline.h | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/libguile/inline.h b/libguile/inline.h index 89bbf9de7..3c9b09b6a 100644 --- a/libguile/inline.h +++ b/libguile/inline.h @@ -4,7 +4,7 @@ #define SCM_INLINE_H /* Copyright (C) 2001, 2002, 2003, 2004, 2006, 2008, 2009, 2010, - * 2011, 2012 Free Software Foundation, Inc. + * 2011, 2012, 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 @@ -37,9 +37,6 @@ #include "libguile/error.h" -SCM_INLINE SCM scm_array_handle_ref (scm_t_array_handle *h, ssize_t pos); -SCM_INLINE void scm_array_handle_set (scm_t_array_handle *h, ssize_t pos, SCM val); - SCM_INLINE int scm_is_string (SCM x); SCM_INLINE SCM scm_cell (scm_t_bits car, scm_t_bits cdr); @@ -50,26 +47,6 @@ SCM_INLINE SCM scm_words (scm_t_bits car, scm_t_uint32 n_words); #if SCM_CAN_INLINE || defined SCM_INLINE_C_IMPLEMENTING_INLINES /* Either inlining, or being included from inline.c. */ -SCM_INLINE_IMPLEMENTATION SCM -scm_array_handle_ref (scm_t_array_handle *h, ssize_t p) -{ - if (SCM_UNLIKELY (p < 0 && ((size_t)-p) > h->base)) - /* catch overflow */ - scm_out_of_range (NULL, scm_from_ssize_t (p)); - /* perhaps should catch overflow here too */ - return h->impl->vref (h, h->base + p); -} - -SCM_INLINE_IMPLEMENTATION void -scm_array_handle_set (scm_t_array_handle *h, ssize_t p, SCM v) -{ - if (SCM_UNLIKELY (p < 0 && ((size_t)-p) > h->base)) - /* catch overflow */ - scm_out_of_range (NULL, scm_from_ssize_t (p)); - /* perhaps should catch overflow here too */ - h->impl->vset (h, h->base + p, v); -} - SCM_INLINE_IMPLEMENTATION int scm_is_string (SCM x) { |