aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-03-23 15:15:04 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-03-23 16:23:39 +0000
commite60d4baa2ea2edcfe34f9f4aa1796c1b0e9c88d9 (patch)
treea85f2f4b7951d377141170170aa1304c217f73df
parent933905c255e67f85ad93aba46f134c2e558610ad (diff)
downloadpaludis-e60d4baa2ea2edcfe34f9f4aa1796c1b0e9c88d9.tar.gz
paludis-e60d4baa2ea2edcfe34f9f4aa1796c1b0e9c88d9.tar.xz
reconcilio/util -> paludis/util
-rw-r--r--.gitignore4
-rw-r--r--configure.ac1
-rw-r--r--paludis/util/files.m42
-rw-r--r--paludis/util/realpath.cc (renamed from src/clients/reconcilio/util/realpath.cc)8
-rw-r--r--paludis/util/realpath.hh (renamed from src/clients/reconcilio/util/realpath.hh)16
-rw-r--r--paludis/util/realpath_TEST.cc (renamed from src/clients/reconcilio/util/realpath_TEST.cc)3
-rwxr-xr-xpaludis/util/realpath_TEST_cleanup.sh (renamed from src/clients/reconcilio/util/realpath_TEST_cleanup.sh)0
-rwxr-xr-xpaludis/util/realpath_TEST_setup.sh (renamed from src/clients/reconcilio/util/realpath_TEST_setup.sh)0
-rw-r--r--paludis/util/wildcard_expander.cc (renamed from src/clients/reconcilio/util/wildcard_expander.cc)2
-rw-r--r--paludis/util/wildcard_expander.hh63
-rw-r--r--paludis/util/wildcard_expander_TEST.cc (renamed from src/clients/reconcilio/util/wildcard_expander_TEST.cc)3
-rwxr-xr-xpaludis/util/wildcard_expander_TEST_cleanup.sh (renamed from src/clients/reconcilio/util/wildcard_expander_TEST_cleanup.sh)0
-rwxr-xr-xpaludis/util/wildcard_expander_TEST_setup.sh (renamed from src/clients/reconcilio/util/wildcard_expander_TEST_setup.sh)0
-rw-r--r--src/clients/reconcilio/Makefile.am3
-rw-r--r--src/clients/reconcilio/broken_linkage_finder/Makefile.am1
-rw-r--r--src/clients/reconcilio/broken_linkage_finder/broken_linkage_finder.cc3
-rw-r--r--src/clients/reconcilio/broken_linkage_finder/configuration.cc5
-rw-r--r--src/clients/reconcilio/broken_linkage_finder/elf_linkage_checker.cc3
-rw-r--r--src/clients/reconcilio/broken_linkage_finder/libtool_linkage_checker.cc3
-rw-r--r--src/clients/reconcilio/util/Makefile.am37
-rw-r--r--src/clients/reconcilio/util/wildcard_expander.hh60
21 files changed, 89 insertions, 128 deletions
diff --git a/.gitignore b/.gitignore
index 925c86d..781e3a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -408,6 +408,7 @@ paludis-*.*.*.tar.bz2
/paludis/util/pretty_print_TEST
/paludis/util/pty_TEST
/paludis/util/random_TEST
+/paludis/util/realpath_TEST
/paludis/util/return_literal_function_TEST
/paludis/util/rmd160_TEST
/paludis/util/safe_ifstream_TEST
@@ -431,6 +432,7 @@ paludis-*.*.*.tar.bz2
/paludis/util/virtual_constructor_TEST
/paludis/util/visitor_TEST
/paludis/util/visitor_cast_TEST
+/paludis/util/wildcard_expander_TEST
/paludis/util/wrapped_forward_iterator_TEST
/paludis/version_operator_TEST
/paludis/version_spec_TEST
@@ -445,8 +447,6 @@ paludis-*.*.*.tar.bz2
/src/clients/paludis/paludis
/src/clients/reconcilio/broken_linkage_finder/configuration_TEST
/src/clients/reconcilio/reconcilio
-/src/clients/reconcilio/util/realpath_TEST
-/src/clients/reconcilio/util/wildcard_expander_TEST
/stamp-h1
/test/test_fail_TEST
/test/test_pass_TEST
diff --git a/configure.ac b/configure.ac
index b39cef6..808669f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1648,7 +1648,6 @@ AC_OUTPUT(
src/clients/reconcilio/Makefile
src/clients/reconcilio/broken_linkage_finder/Makefile
src/clients/reconcilio/littlelf/Makefile
- src/clients/reconcilio/util/Makefile
src/output/Makefile
test/Makefile
vim/Makefile
diff --git a/paludis/util/files.m4 b/paludis/util/files.m4
index 46f46ab..cf68c2b 100644
--- a/paludis/util/files.m4
+++ b/paludis/util/files.m4
@@ -59,6 +59,7 @@ add(`pretty_print', `hh', `cc', `test')
add(`private_implementation_pattern', `hh', `impl')
add(`pty', `hh', `cc', `test')
add(`random', `hh', `cc', `test')
+add(`realpath', `hh', `cc', `test', `testscript')
add(`remove_shared_ptr', `hh')
add(`return_literal_function', `hh', `cc', `fwd', `test')
add(`rmd160', `hh', `cc', `test')
@@ -87,6 +88,7 @@ add(`tribool', `hh', `cc', `fwd', `test')
add(`type_list', `hh', `cc', `fwd')
add(`util', `hh')
add(`validated', `hh', `fwd', `test')
+add(`wildcard_expander', `hh', `cc', `test', `testscript')
add(`wrapped_forward_iterator', `hh', `fwd', `impl', `test')
add(`wrapped_output_iterator', `hh', `fwd', `impl')
diff --git a/src/clients/reconcilio/util/realpath.cc b/paludis/util/realpath.cc
index d1dab89..d69150d 100644
--- a/src/clients/reconcilio/util/realpath.cc
+++ b/paludis/util/realpath.cc
@@ -17,8 +17,7 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "realpath.hh"
-
+#include <paludis/util/realpath.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/util/stringify.hh>
@@ -80,17 +79,18 @@ namespace
}
FSEntry
-realpath_with_current_and_root(const FSEntry & file, const FSEntry & current, const FSEntry & root)
+paludis::realpath_with_current_and_root(const FSEntry & file, const FSEntry & current, const FSEntry & root)
{
unsigned symlinks(0);
return do_realpath_with_current_and_root(file, current, root, file, current, symlinks);
}
FSEntry
-dereference_with_root(const FSEntry & file, const FSEntry & root)
+paludis::dereference_with_root(const FSEntry & file, const FSEntry & root)
{
if (file.is_symbolic_link())
return root / realpath_with_current_and_root(FSEntry(file.readlink()), file.dirname().strip_leading(root), root);
else
return file;
}
+
diff --git a/src/clients/reconcilio/util/realpath.hh b/paludis/util/realpath.hh
index a1911a0..3961c9d 100644
--- a/src/clients/reconcilio/util/realpath.hh
+++ b/paludis/util/realpath.hh
@@ -17,16 +17,18 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef PALUDIS_GUARD_RECONCILIO_UTIL_REALPATH_HH
-#define PALUDIS_GUARD_RECONCILIO_UTIL_REALPATH_HH
+#ifndef PALUDIS_GUARD_PALUDIS_UTIL_REALPATH_HH
+#define PALUDIS_GUARD_PALUDIS_UTIL_REALPATH_HH
#include <paludis/util/attributes.hh>
#include <paludis/util/fs_entry-fwd.hh>
-paludis::FSEntry realpath_with_current_and_root(
- const paludis::FSEntry &, const paludis::FSEntry &, const paludis::FSEntry &) PALUDIS_ATTRIBUTE((warn_unused_result));
-paludis::FSEntry dereference_with_root(const paludis::FSEntry &, const paludis::FSEntry &) PALUDIS_ATTRIBUTE((warn_unused_result));
-
-#endif
+namespace paludis
+{
+ FSEntry realpath_with_current_and_root(
+ const FSEntry &, const FSEntry &, const FSEntry &) PALUDIS_ATTRIBUTE((warn_unused_result)) PALUDIS_VISIBLE;
+ FSEntry dereference_with_root(const FSEntry &, const FSEntry &) PALUDIS_ATTRIBUTE((warn_unused_result)) PALUDIS_VISIBLE;
+}
+#endif
diff --git a/src/clients/reconcilio/util/realpath_TEST.cc b/paludis/util/realpath_TEST.cc
index e1dc042..46a33d5 100644
--- a/src/clients/reconcilio/util/realpath_TEST.cc
+++ b/paludis/util/realpath_TEST.cc
@@ -17,8 +17,7 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "realpath.hh"
-
+#include <paludis/util/realpath.hh>
#include <paludis/util/fs_entry.hh>
#include <test/test_runner.hh>
diff --git a/src/clients/reconcilio/util/realpath_TEST_cleanup.sh b/paludis/util/realpath_TEST_cleanup.sh
index 609b955..609b955 100755
--- a/src/clients/reconcilio/util/realpath_TEST_cleanup.sh
+++ b/paludis/util/realpath_TEST_cleanup.sh
diff --git a/src/clients/reconcilio/util/realpath_TEST_setup.sh b/paludis/util/realpath_TEST_setup.sh
index b1fbfad..b1fbfad 100755
--- a/src/clients/reconcilio/util/realpath_TEST_setup.sh
+++ b/paludis/util/realpath_TEST_setup.sh
diff --git a/src/clients/reconcilio/util/wildcard_expander.cc b/paludis/util/wildcard_expander.cc
index cafa4f4..d1e8437 100644
--- a/src/clients/reconcilio/util/wildcard_expander.cc
+++ b/paludis/util/wildcard_expander.cc
@@ -17,7 +17,7 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "wildcard_expander.hh"
+#include <paludis/util/wildcard_expander.hh>
#include <paludis/util/exception.hh>
#include <paludis/util/fs_entry.hh>
diff --git a/paludis/util/wildcard_expander.hh b/paludis/util/wildcard_expander.hh
new file mode 100644
index 0000000..23cf8b5
--- /dev/null
+++ b/paludis/util/wildcard_expander.hh
@@ -0,0 +1,63 @@
+/* vim: set sw=4 sts=4 et foldmethod=syntax : */
+
+/*
+ * Copyright (c) 2007 David Leverton
+ *
+ * This file is part of the Paludis package manager. Paludis is free software;
+ * you can redistribute it and/or modify it under the terms of the GNU General
+ * Public License version 2, as published by the Free Software Foundation.
+ *
+ * Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the 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., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef PALUDIS_GUARD_PALUDIS_UTIL_WILDCARD_EXPANDER_HH
+#define PALUDIS_GUARD_PALUDIS_UTIL_WILDCARD_EXPANDER_HH
+
+#include <paludis/util/attributes.hh>
+#include <paludis/util/fs_entry.hh>
+#include <paludis/util/operators.hh>
+#include <paludis/util/private_implementation_pattern.hh>
+
+#include <iterator>
+
+namespace paludis
+{
+ class PALUDIS_VISIBLE WildcardExpansionError :
+ public FSError
+ {
+ public:
+ WildcardExpansionError(const std::string & message) throw ();
+ };
+
+ class PALUDIS_VISIBLE WildcardExpander :
+ public std::iterator<std::forward_iterator_tag, const FSEntry>,
+ public equality_operators::HasEqualityOperators,
+ private PrivateImplementationPattern<WildcardExpander>
+ {
+ public:
+ WildcardExpander(const std::string &, const FSEntry & = FSEntry("/"));
+ WildcardExpander();
+ WildcardExpander(const WildcardExpander &);
+
+ ~WildcardExpander();
+
+ WildcardExpander & operator= (const WildcardExpander &);
+
+ const FSEntry & operator* () const PALUDIS_ATTRIBUTE((warn_unused_result));
+ const FSEntry * operator-> () const PALUDIS_ATTRIBUTE((warn_unused_result));
+
+ WildcardExpander & operator++ ();
+ WildcardExpander operator++ (int);
+
+ bool operator== (const WildcardExpander &) const PALUDIS_ATTRIBUTE((warn_unused_result));
+ };
+}
+
+#endif
diff --git a/src/clients/reconcilio/util/wildcard_expander_TEST.cc b/paludis/util/wildcard_expander_TEST.cc
index e1bf74d..98327a6 100644
--- a/src/clients/reconcilio/util/wildcard_expander_TEST.cc
+++ b/paludis/util/wildcard_expander_TEST.cc
@@ -17,8 +17,7 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "wildcard_expander.hh"
-
+#include <paludis/util/wildcard_expander.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/util/join.hh>
diff --git a/src/clients/reconcilio/util/wildcard_expander_TEST_cleanup.sh b/paludis/util/wildcard_expander_TEST_cleanup.sh
index 7ab9c36..7ab9c36 100755
--- a/src/clients/reconcilio/util/wildcard_expander_TEST_cleanup.sh
+++ b/paludis/util/wildcard_expander_TEST_cleanup.sh
diff --git a/src/clients/reconcilio/util/wildcard_expander_TEST_setup.sh b/paludis/util/wildcard_expander_TEST_setup.sh
index 1ff139d..1ff139d 100755
--- a/src/clients/reconcilio/util/wildcard_expander_TEST_setup.sh
+++ b/paludis/util/wildcard_expander_TEST_setup.sh
diff --git a/src/clients/reconcilio/Makefile.am b/src/clients/reconcilio/Makefile.am
index d455097..5960d17 100644
--- a/src/clients/reconcilio/Makefile.am
+++ b/src/clients/reconcilio/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/misc/common-makefile.am
AM_CXXFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src \
@PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
-SUBDIRS = util littlelf broken_linkage_finder .
+SUBDIRS = littlelf broken_linkage_finder .
bin_PROGRAMS = reconcilio
noinst_PROGRAMS = man-reconcilio
@@ -34,7 +34,6 @@ reconcilio_SOURCES = \
reconcilio_LDADD = \
broken_linkage_finder/libbrokenlinkagefinder.a \
littlelf/liblittlelf.a \
- util/libreconcilioutil.a \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
diff --git a/src/clients/reconcilio/broken_linkage_finder/Makefile.am b/src/clients/reconcilio/broken_linkage_finder/Makefile.am
index bdaac56..2b932ae 100644
--- a/src/clients/reconcilio/broken_linkage_finder/Makefile.am
+++ b/src/clients/reconcilio/broken_linkage_finder/Makefile.am
@@ -22,7 +22,6 @@ EXTRA_DIST = \
configuration_TEST_SOURCES = configuration_TEST.cc
configuration_TEST_LDADD = \
libbrokenlinkagefinder.a \
- ../util/libreconcilioutil.a \
$(top_builddir)/src/clients/reconcilio/littlelf/liblittlelf.a \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
diff --git a/src/clients/reconcilio/broken_linkage_finder/broken_linkage_finder.cc b/src/clients/reconcilio/broken_linkage_finder/broken_linkage_finder.cc
index 7d6ead5..bb8a502 100644
--- a/src/clients/reconcilio/broken_linkage_finder/broken_linkage_finder.cc
+++ b/src/clients/reconcilio/broken_linkage_finder/broken_linkage_finder.cc
@@ -23,8 +23,7 @@
#include "libtool_linkage_checker.hh"
#include "linkage_checker.hh"
-#include <src/clients/reconcilio/util/realpath.hh>
-
+#include <paludis/util/realpath.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/util/dir_iterator.hh>
#include <paludis/util/log.hh>
diff --git a/src/clients/reconcilio/broken_linkage_finder/configuration.cc b/src/clients/reconcilio/broken_linkage_finder/configuration.cc
index 398eb2e..e11f1ad 100644
--- a/src/clients/reconcilio/broken_linkage_finder/configuration.cc
+++ b/src/clients/reconcilio/broken_linkage_finder/configuration.cc
@@ -19,9 +19,8 @@
#include "configuration.hh"
-#include <src/clients/reconcilio/util/realpath.hh>
-#include <src/clients/reconcilio/util/wildcard_expander.hh>
-
+#include <paludis/util/realpath.hh>
+#include <paludis/util/wildcard_expander.hh>
#include <paludis/util/config_file.hh>
#include <paludis/util/dir_iterator.hh>
#include <paludis/util/join.hh>
diff --git a/src/clients/reconcilio/broken_linkage_finder/elf_linkage_checker.cc b/src/clients/reconcilio/broken_linkage_finder/elf_linkage_checker.cc
index b6d962f..c51602c 100644
--- a/src/clients/reconcilio/broken_linkage_finder/elf_linkage_checker.cc
+++ b/src/clients/reconcilio/broken_linkage_finder/elf_linkage_checker.cc
@@ -19,14 +19,13 @@
#include "elf_linkage_checker.hh"
-#include <src/clients/reconcilio/util/realpath.hh>
-
#include <src/clients/reconcilio/littlelf/elf.hh>
#include <src/clients/reconcilio/littlelf/elf_dynamic_section.hh>
#include <src/clients/reconcilio/littlelf/elf_types.hh>
#include <src/clients/reconcilio/littlelf/elf_relocation_section.hh>
#include <src/clients/reconcilio/littlelf/elf_symbol_section.hh>
+#include <paludis/util/realpath.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/util/join.hh>
#include <paludis/util/log.hh>
diff --git a/src/clients/reconcilio/broken_linkage_finder/libtool_linkage_checker.cc b/src/clients/reconcilio/broken_linkage_finder/libtool_linkage_checker.cc
index 7c218fd..890bd30 100644
--- a/src/clients/reconcilio/broken_linkage_finder/libtool_linkage_checker.cc
+++ b/src/clients/reconcilio/broken_linkage_finder/libtool_linkage_checker.cc
@@ -19,8 +19,7 @@
#include "libtool_linkage_checker.hh"
-#include <src/clients/reconcilio/util/realpath.hh>
-
+#include <paludis/util/realpath.hh>
#include <paludis/util/config_file.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/util/log.hh>
diff --git a/src/clients/reconcilio/util/Makefile.am b/src/clients/reconcilio/util/Makefile.am
deleted file mode 100644
index 6a49e9c..0000000
--- a/src/clients/reconcilio/util/Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-include $(top_srcdir)/misc/common-makefile.am
-
-AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
-
-SUBDIRS = .
-
-noinst_LIBRARIES = libreconcilioutil.a
-
-libreconcilioutil_a_SOURCES = \
- realpath.cc realpath.hh \
- wildcard_expander.cc wildcard_expander.hh
-
-TESTS = realpath_TEST wildcard_expander_TEST
-check_PROGRAMS = $(TESTS)
-
-EXTRA_DIST = \
- realpath_TEST_setup.sh realpath_TEST_cleanup.sh \
- wildcard_expander_TEST_setup.sh wildcard_expander_TEST_cleanup.sh
-
-realpath_TEST_SOURCES = realpath_TEST.cc
-realpath_TEST_LDADD = \
- libreconcilioutil.a \
- $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/util/test_extras.o \
- $(top_builddir)/test/libtest.a
-
-realpath_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
-
-wildcard_expander_TEST_SOURCES = wildcard_expander_TEST.cc
-wildcard_expander_TEST_LDADD = \
- libreconcilioutil.a \
- $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/util/test_extras.o \
- $(top_builddir)/test/libtest.a
-
-wildcard_expander_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
-
diff --git a/src/clients/reconcilio/util/wildcard_expander.hh b/src/clients/reconcilio/util/wildcard_expander.hh
deleted file mode 100644
index 2c93db2..0000000
--- a/src/clients/reconcilio/util/wildcard_expander.hh
+++ /dev/null
@@ -1,60 +0,0 @@
-/* vim: set sw=4 sts=4 et foldmethod=syntax : */
-
-/*
- * Copyright (c) 2007 David Leverton
- *
- * This file is part of the Paludis package manager. Paludis is free software;
- * you can redistribute it and/or modify it under the terms of the GNU General
- * Public License version 2, as published by the Free Software Foundation.
- *
- * Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the 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., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifndef PALUDIS_GUARD_RECONCILIO_UTIL_WILDCARD_EXPANDER_HH
-#define PALUDIS_GUARD_RECONCILIO_UTIL_WILDCARD_EXPANDER_HH
-
-#include <paludis/util/attributes.hh>
-#include <paludis/util/fs_entry.hh>
-#include <paludis/util/operators.hh>
-#include <paludis/util/private_implementation_pattern.hh>
-
-#include <iterator>
-
-class PALUDIS_VISIBLE WildcardExpansionError : public paludis::FSError
-{
- public:
- WildcardExpansionError(const std::string & message) throw ();
-};
-
-class PALUDIS_VISIBLE WildcardExpander :
- public std::iterator<std::forward_iterator_tag, const paludis::FSEntry>,
- public paludis::equality_operators::HasEqualityOperators,
- private paludis::PrivateImplementationPattern<WildcardExpander>
-{
- public:
- WildcardExpander(const std::string &, const paludis::FSEntry & = paludis::FSEntry("/"));
- WildcardExpander();
- WildcardExpander(const WildcardExpander &);
-
- ~WildcardExpander();
-
- WildcardExpander & operator= (const WildcardExpander &);
-
- const paludis::FSEntry & operator* () const PALUDIS_ATTRIBUTE((warn_unused_result));
- const paludis::FSEntry * operator-> () const PALUDIS_ATTRIBUTE((warn_unused_result));
-
- WildcardExpander & operator++ ();
- WildcardExpander operator++ (int);
-
- bool operator== (const WildcardExpander &) const PALUDIS_ATTRIBUTE((warn_unused_result));
-};
-
-#endif
-