[glom/glom-1-12] Fix the build with exceptions disabled.



commit 89c9a6c3f881e4e6a682f73b59dca43e39d9dd9c
Author: Peter Penz <ppenz openismus com>
Date:   Mon Mar 8 12:45:16 2010 +0100

    Fix the build with exceptions disabled.
    
    * glom/libglom/document/bakery/document_xml.cc:
    * glom/mode_design/iso_codes.cc: The exception handling is enabled by the
        define LIBXMLPP_EXCEPTIONS_ENABLED. But this is a typo, as libxml++ defines
        LIBXMLCPP_EXCEPTIONS_ENABLED.

 ChangeLog                                    |    9 +++++++++
 glom/libglom/document/bakery/document_xml.cc |   12 ++++++------
 glom/mode_design/iso_codes.cc                |    2 +-
 3 files changed, 16 insertions(+), 7 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 938c71a..704d387 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-03-08  Peter Penz  <ppenz openismus com>
+
+	Fix the build with exceptions disabled.
+
+	* glom/libglom/document/bakery/document_xml.cc:
+	* glom/mode_design/iso_codes.cc: The exception handling is enabled by the
+    define LIBXMLPP_EXCEPTIONS_ENABLED. But this is a typo, as libxml++ defines
+    LIBXMLCPP_EXCEPTIONS_ENABLED.
+
 2010-02-08  Peter Penz <ppenz openismus com>
 
   libglom: Fix build issue for Maemo.
diff --git a/glom/libglom/document/bakery/document_xml.cc b/glom/libglom/document/bakery/document_xml.cc
index cfd4579..558ff07 100644
--- a/glom/libglom/document/bakery/document_xml.cc
+++ b/glom/libglom/document/bakery/document_xml.cc
@@ -43,7 +43,7 @@ bool Document_XML::load_after(int& failure_code)
   if(!bTest)
     return false; //Failed.
 
-#ifdef LIBXMLPP_EXCEPTIONS_ENABLED
+#ifdef LIBXMLCPP_EXCEPTIONS_ENABLED
   try
 #endif
   {
@@ -59,7 +59,7 @@ bool Document_XML::load_after(int& failure_code)
 
     return true; //Success.
   }
-#ifdef LIBXMLPP_EXCEPTIONS_ENABLED
+#ifdef LIBXMLCPP_EXCEPTIONS_ENABLED
   catch(const std::exception& ex)
   {
     std::cerr << "XML Parser error: \n" << ex.what() << std::endl;
@@ -91,7 +91,7 @@ bool Document_XML::save_before()
 //TODO: Why is this parameter here if it is not used?
 bool Document_XML::set_xml(const Glib::ustring& /* strXML */)
 { 
-#ifdef LIBXMLPP_EXCEPTIONS_ENABLED
+#ifdef LIBXMLCPP_EXCEPTIONS_ENABLED
   try
 #endif
   {
@@ -105,7 +105,7 @@ bool Document_XML::set_xml(const Glib::ustring& /* strXML */)
 
     return true;	
   }
-#ifdef LIBXMLPP_EXCEPTIONS_ENABLED
+#ifdef LIBXMLCPP_EXCEPTIONS_ENABLED
   catch(const std::exception& ex)
   {
     std::cerr << "XML Parser error: \n" << ex.what() << std::endl;
@@ -125,7 +125,7 @@ Glib::ustring Document_XML::get_xml() const
 
 void Document_XML::Util_DOM_Write(Glib::ustring& refstrXML) const
 {
-#ifdef LIBXMLPP_EXCEPTIONS_ENABLED
+#ifdef LIBXMLCPP_EXCEPTIONS_ENABLED
   try
 #endif
   {
@@ -134,7 +134,7 @@ void Document_XML::Util_DOM_Write(Glib::ustring& refstrXML) const
     else
       refstrXML = m_pDOM_Document->write_to_string();
   }
-#ifdef LIBXMLPP_EXCEPTIONS_ENABLED
+#ifdef LIBXMLCPP_EXCEPTIONS_ENABLED
   catch(xmlpp::exception& ex)
   {
     std::cerr << "Document_XML::Util_DOM_Write(): exception caught: " << ex.what() << std::endl;
diff --git a/glom/mode_design/iso_codes.cc b/glom/mode_design/iso_codes.cc
index 6010018..6272a23 100644
--- a/glom/mode_design/iso_codes.cc
+++ b/glom/mode_design/iso_codes.cc
@@ -90,7 +90,7 @@ type_list_currencies get_list_of_currency_symbols()
     {
       std::cerr << "Exception while parsing iso codes (currencies): " << ex.what() << std::endl;
     }
-#endif // LIBXMLPP_EXCEPTIONS_ENABLED
+#endif // LIBXMLCPP_EXCEPTIONS_ENABLED
   }
 
   return list_currencies;



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