Fix compile errors in the absence of std::unordered_set

vaeth · Apr 14, 2022 · 886513f · 886513f
1 parent 19c0ca7
commit 886513f
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 20 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,10 @@
 # ChangeLog for eix - Ebuild IndeX for portage
 
+*eix-0.36.2
+	Martin Väth <martin at mvath.de>:
+	- Fix compile errors in the absence of std::unordered_set, see
+	  https://bugs.gentoo.org/838358
+
 *eix-0.36.1
 	Jannik Glückert <https://github.com/Jannik2099>:
 	- Remove unsupported ATTRIBUTE_SIGNAL

diff --git a/configure.ac b/configure.ac
@@ -41,7 +41,7 @@ dnl    each item is listed in a separate line with indent level increased;
 dnl    in such a case the opening/closing braces are isolated.
 dnl 2. The AC_INIT macro must be in one line since it is parsed by
 dnl    primitive scripts.
-AC_INIT([eix], [0.36.1], [https://github.com/vaeth/eix/issues/], [eix], [https://github.com/vaeth/eix/])
+AC_INIT([eix], [0.36.2], [https://github.com/vaeth/eix/issues/], [eix], [https://github.com/vaeth/eix/])
 AC_PREREQ([2.64])
 
 m4_ifdef([AC_CONFIG_MACRO_DIR],

diff --git a/meson.build b/meson.build
@@ -1,5 +1,5 @@
 project('eix', 'cpp',
-	version : '0.36.1',
+	version : '0.36.2',
 	license : 'GPLv2',
 	default_options : [
 		'prefix=/usr',

diff --git a/src/eixTk/stringutils.cc b/src/eixTk/stringutils.cc
@@ -487,9 +487,11 @@ void split_string(WordSet *vec, const string& str, bool handle_escape, const cha
 	split_string_template<WordSet>(vec, str, handle_escape, at, ignore_empty);
 }
 
+#ifdef HAVE_UNORDERED_SET
 void split_string(WordUnorderedSet *vec, const string& str, bool handle_escape, const char *at, bool ignore_empty) {
 	split_string_template<WordUnorderedSet>(vec, str, handle_escape, at, ignore_empty);
 }
+#endif
 
 WordVec split_string(const string& str, bool handle_escape, const char *at, bool ignore_empty) {
 	WordVec vec;

diff --git a/src/eixTk/stringutils.h b/src/eixTk/stringutils.h
@@ -207,44 +207,46 @@ Split a string into multiple strings.
                      removing escapes for \\ or "at" symbols from result.
 **/
 ATTRIBUTE_NONNULL_ void split_string(WordVec *vec, const std::string& str, bool handle_escape, const char *at, bool ignore_empty);
-ATTRIBUTE_NONNULL_ void split_string(WordSet *vec, const std::string& str, bool handle_escape, const char *at, bool ignore_empty);
-ATTRIBUTE_NONNULL_ void split_string(WordUnorderedSet *vec, const std::string& str, bool handle_escape, const char *at, bool ignore_empty);
 ATTRIBUTE_NONNULL_ inline static void split_string(WordVec *vec, const std::string& str, bool handle_escape, const char *at);
 inline static void split_string(WordVec *vec, const std::string& str, bool handle_escape, const char *at) {
 	split_string(vec, str, handle_escape, at, true);
 }
-ATTRIBUTE_NONNULL_ inline static void split_string(WordSet *vec, const std::string& str, bool handle_escape, const char *at);
-inline static void split_string(WordSet *vec, const std::string& str, bool handle_escape, const char *at) {
-	split_string(vec, str, handle_escape, at, true);
-}
-ATTRIBUTE_NONNULL_ inline static void split_string(WordUnorderedSet *vec, const std::string& str, bool handle_escape, const char *at);
-inline static void split_string(WordUnorderedSet *vec, const std::string& str, bool handle_escape, const char *at) {
-	split_string(vec, str, handle_escape, at, true);
-}
 ATTRIBUTE_NONNULL_ inline static void split_string(WordVec *vec, const std::string& str, bool handle_escape);
 inline static void split_string(WordVec *vec, const std::string& str, bool handle_escape) {
 	split_string(vec, str, handle_escape, spaces);
 }
-ATTRIBUTE_NONNULL_ inline static void split_string(WordSet *vec, const std::string& str, bool handle_escape);
-inline static void split_string(WordSet *vec, const std::string& str, bool handle_escape) {
-	split_string(vec, str, handle_escape, spaces);
-}
-ATTRIBUTE_NONNULL_ inline static void split_string(WordUnorderedSet *vec, const std::string& str, bool handle_escape);
-inline static void split_string(WordUnorderedSet *vec, const std::string& str, bool handle_escape) {
-	split_string(vec, str, handle_escape, spaces);
-}
 ATTRIBUTE_NONNULL_ inline static void split_string(WordVec *vec, const std::string& str);
 inline static void split_string(WordVec *vec, const std::string& str) {
 	split_string(vec, str, false);
 }
+ATTRIBUTE_NONNULL_ void split_string(WordSet *vec, const std::string& str, bool handle_escape, const char *at, bool ignore_empty);
+ATTRIBUTE_NONNULL_ inline static void split_string(WordSet *vec, const std::string& str, bool handle_escape, const char *at);
+inline static void split_string(WordSet *vec, const std::string& str, bool handle_escape, const char *at) {
+	split_string(vec, str, handle_escape, at, true);
+}
+ATTRIBUTE_NONNULL_ inline static void split_string(WordSet *vec, const std::string& str, bool handle_escape);
+inline static void split_string(WordSet *vec, const std::string& str, bool handle_escape) {
+	split_string(vec, str, handle_escape, spaces);
+}
 ATTRIBUTE_NONNULL_ inline static void split_string(WordSet *vec, const std::string& str);
 inline static void split_string(WordSet *vec, const std::string& str) {
 	split_string(vec, str, false);
 }
+#ifdef HAVE_UNORDERED_SET
+ATTRIBUTE_NONNULL_ void split_string(WordUnorderedSet *vec, const std::string& str, bool handle_escape, const char *at, bool ignore_empty);
+ATTRIBUTE_NONNULL_ inline static void split_string(WordUnorderedSet *vec, const std::string& str, bool handle_escape, const char *at);
+inline static void split_string(WordUnorderedSet *vec, const std::string& str, bool handle_escape, const char *at) {
+	split_string(vec, str, handle_escape, at, true);
+}
+ATTRIBUTE_NONNULL_ inline static void split_string(WordUnorderedSet *vec, const std::string& str, bool handle_escape);
+inline static void split_string(WordUnorderedSet *vec, const std::string& str, bool handle_escape) {
+	split_string(vec, str, handle_escape, spaces);
+}
 ATTRIBUTE_NONNULL_ inline static void split_string(WordUnorderedSet *vec, const std::string& str);
 inline static void split_string(WordUnorderedSet *vec, const std::string& str) {
 	split_string(vec, str, false);
 }
+#endif
 
 /**
 Check if slot contains a subslot and if yes, split it away.