Fix make check with --enable-warnings=fatal and fix make distcheck

Kjell Ahlstedt · Kjell Ahlstedt · commit e728c92fe134 · 2015-08-27T17:04:55.000+02:00
* tests/saxparser_chunk_parsing_inconsistent_state/main.cc:
* tests/saxparser_parse_double_free/main.cc: Comment out names of unused
parameters in function definitions.
* Makefile.am: Add wrapped_exception.h to h_exceptions_sources_public or else
it won't be distributed.
* libxml++/exceptions/wrapped_exception.h: Add DOXYGEN_SHOULD_SKIP_THIS.
xmlpp::wrapped_exception is a private class that shall not be included in
the documentation. Bug #753570.
diff --git a/Makefile.am b/Makefile.am
@@ -34,7 +34,8 @@ h_root_sources_public = libxml++/libxml++.h \
 h_exceptions_sources_public = libxml++/exceptions/exception.h \
 	libxml++/exceptions/parse_error.h \
 	libxml++/exceptions/validity_error.h \
-	libxml++/exceptions/internal_error.h
+	libxml++/exceptions/internal_error.h \
+	libxml++/exceptions/wrapped_exception.h
 h_io_sources_public = libxml++/io/istreamparserinputbuffer.h \
 	libxml++/io/outputbuffer.h \
 	libxml++/io/ostreamoutputbuffer.h \
diff --git a/libxml++/exceptions/wrapped_exception.h b/libxml++/exceptions/wrapped_exception.h
@@ -25,6 +25,7 @@
 namespace xmlpp
 {
 
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
 class wrapped_exception : public exception
 {
 public:
@@ -37,6 +38,7 @@ class wrapped_exception : public exception
 private:
   std::exception_ptr exception_ptr_;
 };
+#endif //DOXYGEN_SHOULD_SKIP_THIS
 
 } // namespace xmlpp
 
diff --git a/tests/saxparser_chunk_parsing_inconsistent_state/main.cc b/tests/saxparser_chunk_parsing_inconsistent_state/main.cc
@@ -29,7 +29,7 @@ class MySaxParser : public xmlpp::SaxParser
   {
     throw std::runtime_error("some custom runtime exception");
   }
-  void on_error(const Glib::ustring& text) override
+  void on_error(const Glib::ustring& /* text */) override
   {
     throw std::runtime_error("on_error() called");
   }
diff --git a/tests/saxparser_parse_double_free/main.cc b/tests/saxparser_parse_double_free/main.cc
@@ -159,7 +159,9 @@ void test_on_end_element()
 class OnEntityDeclarationTestParser : public xmlpp::SaxParser
 {
 protected:
-  void on_entity_declaration(const Glib::ustring& name, xmlpp::XmlEntityType type, const Glib::ustring& publicId, const Glib::ustring& systemId, const Glib::ustring& content) override
+  void on_entity_declaration(const Glib::ustring& name, xmlpp::XmlEntityType /* type */,
+    const Glib::ustring& /* publicId */, const Glib::ustring& /* systemId */,
+    const Glib::ustring& content) override
   {
     g_assert_cmpstr(name.c_str(), ==, "number");
     g_assert_cmpstr(content.c_str(), ==, "42");
@@ -187,7 +189,7 @@ void test_on_entity_declaration()
 class OnErrorTestParser : public xmlpp::SaxParser
 {
 protected:
-  void on_error(const Glib::ustring& text) override
+  void on_error(const Glib::ustring& /* text */) override
   {
     throw std::runtime_error("on_error runtime exception");
   }

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@`
`25`	`25`	`namespace xmlpp`
`26`	`26`	`{`
`27`	`27`
	`28`	`+#ifndef DOXYGEN_SHOULD_SKIP_THIS`
`28`	`29`	`class wrapped_exception : public exception`
`29`	`30`	`{`
`30`	`31`	`public:`
`@@ -37,6 +38,7 @@ class wrapped_exception : public exception`
`37`	`38`	`private:`
`38`	`39`	`std::exception_ptr exception_ptr_;`
`39`	`40`	`};`
	`41`	`+#endif //DOXYGEN_SHOULD_SKIP_THIS`
`40`	`42`
`41`	`43`	`} // namespace xmlpp`
`42`	`44`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class MySaxParser : public xmlpp::SaxParser`
`29`	`29`	`{`
`30`	`30`	`throw std::runtime_error("some custom runtime exception");`
`31`	`31`	`}`
`32`		`- void on_error(const Glib::ustring& text) override`
	`32`	`+ void on_error(const Glib::ustring& /* text */) override`
`33`	`33`	`{`
`34`	`34`	`throw std::runtime_error("on_error() called");`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,9 @@ void test_on_end_element()`
`159`	`159`	`class OnEntityDeclarationTestParser : public xmlpp::SaxParser`
`160`	`160`	`{`
`161`	`161`	`protected:`
`162`		`- void on_entity_declaration(const Glib::ustring& name, xmlpp::XmlEntityType type, const Glib::ustring& publicId, const Glib::ustring& systemId, const Glib::ustring& content) override`
	`162`	`+ void on_entity_declaration(const Glib::ustring& name, xmlpp::XmlEntityType /* type */,`
	`163`	`+ const Glib::ustring& /* publicId /, const Glib::ustring& / systemId */,`
	`164`	`+ const Glib::ustring& content) override`
`163`	`165`	`{`
`164`	`166`	`g_assert_cmpstr(name.c_str(), ==, "number");`
`165`	`167`	`g_assert_cmpstr(content.c_str(), ==, "42");`
`@@ -187,7 +189,7 @@ void test_on_entity_declaration()`
`187`	`189`	`class OnErrorTestParser : public xmlpp::SaxParser`
`188`	`190`	`{`
`189`	`191`	`protected:`
`190`		`- void on_error(const Glib::ustring& text) override`
	`192`	`+ void on_error(const Glib::ustring& /* text */) override`
`191`	`193`	`{`
`192`	`194`	`throw std::runtime_error("on_error runtime exception");`
`193`	`195`	`}`