X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgl_oset.c;h=e067035d1e98dc0e7cce43af4dfe2622f6576ce1;hb=3ac9b4577c78342bdd022b31cf56de2b12f7297b;hp=9e364f264515d0e5409455d57980788110556c8f;hpb=57fdfd3f8ec62b105c53bcdf6f127c35c7fe7391;p=gnulib.git

diff --git a/lib/gl_oset.c b/lib/gl_oset.c
index 9e364f264..e067035d1 100644
--- a/lib/gl_oset.c
+++ b/lib/gl_oset.c
@@ -1,5 +1,5 @@
 /* Abstract ordered set data type.
-   Copyright (C) 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2009-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
@@ -27,11 +27,12 @@
    Use #define to avoid a warning because of extern vs. static.  */
 
 gl_oset_t
-gl_oset_create_empty (gl_oset_implementation_t implementation,
-		      gl_setelement_compar_fn compar_fn,
-		      gl_setelement_dispose_fn dispose_fn)
+gl_oset_nx_create_empty (gl_oset_implementation_t implementation,
+                         gl_setelement_compar_fn compar_fn,
+                         gl_setelement_dispose_fn dispose_fn)
 {
-  return implementation->create_empty (implementation, compar_fn, dispose_fn);
+  return implementation->nx_create_empty (implementation, compar_fn,
+                                          dispose_fn);
 }
 
 size_t
@@ -48,23 +49,24 @@ gl_oset_search (gl_oset_t set, const void *elt)
 
 bool
 gl_oset_search_atleast (gl_oset_t set,
-			gl_setelement_threshold_fn threshold_fn,
-			const void *threshold, const void **eltp)
+                        gl_setelement_threshold_fn threshold_fn,
+                        const void *threshold, const void **eltp)
 {
   return ((const struct gl_oset_impl_base *) set)->vtable
-	 ->search_atleast (set, threshold_fn, threshold, eltp);
+         ->search_atleast (set, threshold_fn, threshold, eltp);
 }
 
-bool
-gl_oset_add (gl_oset_t set, const void *elt)
+int
+gl_oset_nx_add (gl_oset_t set, const void *elt)
 {
-  return ((const struct gl_oset_impl_base *) set)->vtable->add (set, elt);
+  return ((const struct gl_oset_impl_base *) set)->vtable->nx_add (set, elt);
 }
 
 bool
 gl_oset_remove (gl_oset_t set, const void *elt)
 {
-  return ((const struct gl_oset_impl_base *) set)->vtable->remove (set, elt);
+  return ((const struct gl_oset_impl_base *) set)->vtable
+         ->remove_elt (set, elt);
 }
 
 void