DomParser, SaxParser: Move anonymous namespace out of namespace xmlpp

kjellahl · kjellahl · commit 649c5ee6cf51 · 2022-09-06T08:58:38.000+02:00
diff --git a/libxml++/parsers/domparser.cc b/libxml++/parsers/domparser.cc
@@ -17,6 +17,19 @@
 #include <sstream>
 #include <iostream>
 
+namespace {
+  extern "C" {
+    static int _io_read_callback(void * context,
+                                 char * buffer,
+                                 int len)
+    {
+      auto in = static_cast<std::istream*>(context);
+      in->read(buffer, len);
+      return in->gcount();
+    }
+  }
+}
+
 namespace xmlpp
 {
 
@@ -174,19 +187,6 @@ void DomParser::check_xinclude_and_finish_parsing()
   Parser::release_underlying();
 }
 
-namespace {
-  extern "C" {
-    static int _io_read_callback(void * context,
-                                 char * buffer,
-                                 int len)
-    {
-      auto in = static_cast<std::istream*>(context);
-      in->read(buffer, len);
-      return in->gcount();
-    }
-  }
-}
-
 void DomParser::parse_stream(std::istream& in)
 {
   release_underlying(); //Free any existing document.
diff --git a/libxml++/parsers/saxparser.cc b/libxml++/parsers/saxparser.cc
@@ -17,6 +17,19 @@
 #include <cstdarg> //For va_list.
 #include <iostream>
 
+namespace {
+  extern "C" {
+    static int _io_read_callback(void * context,
+                                 char * buffer,
+                                 int len)
+    {
+      auto in = static_cast<std::istream*>(context);
+      in->read(buffer, len);
+      return in->gcount();
+    }
+  }
+}
+
 namespace xmlpp {
 
 struct SaxParserCallback
@@ -209,19 +222,6 @@ void SaxParser::parse_memory(const ustring& contents)
   parse_memory_raw((const unsigned char*)contents.c_str(), contents.size());
 }
 
-namespace {
-  extern "C" {
-    static int _io_read_callback(void * context,
-                                 char * buffer,
-                                 int len)
-    {
-      auto in = static_cast<std::istream*>(context);
-      in->read(buffer, len);
-      return in->gcount();
-    }
-  }
-}
-
 void SaxParser::parse_stream(std::istream& in)
 {
   if(context_)
diff --git a/tests/meson.build b/tests/meson.build
@@ -5,10 +5,10 @@
 
 test_programs = [
 # [[dir-name], exe-name, [sources]]
+  [['istream_ioparser'], 'test', ['main.cc']],
   [['saxparser_chunk_parsing_inconsistent_state'], 'test', ['main.cc']],
   [['saxparser_parse_double_free'], 'test', ['main.cc']],
   [['saxparser_parse_stream_inconsistent_state'], 'test', ['main.cc']],
-  [['istream_ioparser'], 'test', ['main.cc']],
 ]
 
 foreach ex : test_programs
