[libxml++] Fix make check with --enable-warnings=fatal and fix make distcheck



commit e728c92fe1341caeda4838c7f416364da99c304a
Author: Kjell Ahlstedt <kjell ahlstedt bredband net>
Date:   Thu Aug 27 17:04:55 2015 +0200

    Fix make check with --enable-warnings=fatal and fix make distcheck
    
    * 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.

 Makefile.am                                        |    3 ++-
 libxml++/exceptions/wrapped_exception.h            |    2 ++
 .../main.cc                                        |    2 +-
 tests/saxparser_parse_double_free/main.cc          |    6 ++++--
 4 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 4483936..a0088d7 100644
--- 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
index 0653842..06b7808 100644
--- 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 @@ public:
 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
index 7e5a636..5e34233 100644
--- a/tests/saxparser_chunk_parsing_inconsistent_state/main.cc
+++ b/tests/saxparser_chunk_parsing_inconsistent_state/main.cc
@@ -29,7 +29,7 @@ protected:
   {
     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
index 67dacd8..faaf964 100644
--- 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");
   }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]