projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
iconv: Work around AIX 6.1..7.1 bug.
[gnulib.git]
/
lib
/
gl_oset.c
diff --git
a/lib/gl_oset.c
b/lib/gl_oset.c
index
83f964e
..
e067035
100644
(file)
--- a/
lib/gl_oset.c
+++ b/
lib/gl_oset.c
@@
-1,11
+1,11
@@
/* Abstract ordered set data type.
/* Abstract ordered set data type.
- Copyright (C) 2006 Free Software Foundation, Inc.
+ Copyright (C) 2006
-2007, 2009-2010
Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2006.
Written by Bruno Haible <bruno@clisp.org>, 2006.
- This program is free software
;
you can redistribute it and/or modify
+ This program is free software
:
you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version
2, or (at your option)
- any later version.
+ the Free Software Foundation; either version
3 of the License, or
+
(at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-13,8
+13,7
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
#include <config.h>
@@
-28,10
+27,12
@@
Use #define to avoid a warning because of extern vs. static. */
gl_oset_t
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_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);
+ return implementation->nx_create_empty (implementation, compar_fn,
+ dispose_fn);
}
size_t
}
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,
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
{
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)
{
}
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
}
void