Commit 467117d7 authored by Murray Cumming's avatar Murray Cumming Committed by Murray Cumming

When exceptions are disabled, assume that they are also disabled in glibmm

2007-08-30  Murray Cumming  <murrayc@murrayc.com>

* examples/dom_parser_raw/main.cc: When exceptions are disabled, assume that they are also 
disabled in glibmm and then use the extra error parameter to Glib::convert(), to fix the 
build when using glibmm with disabled exceptions.
* docs/manual/Makefile.am: Use maintainer-clean instead of clean-local to delete the html, 
but this still seems to be deleted when building debian packages.

svn path=/trunk/; revision=162
parent 245bb499
2007-08-30 Murray Cumming <murrayc@murrayc.com>
* examples/dom_parser_raw/main.cc: When exceptions are disabled, assume that they are also
disabled in glibmm and then use the extra error parameter to Glib::convert(), to fix the
build when using glibmm with disabled exceptions.
* docs/manual/Makefile.am: Use maintainer-clean instead of clean-local to delete the html,
but this still seems to be deleted when building debian packages.
2.19.2:
2007-08-29 Murray Cumming <murrayc@murrayc.com>
......
......@@ -65,7 +65,7 @@ uninstall-local: uninstall-manual
all-local: $(srcdir)/html/index.html
clean-local:
maintainer-clean-local:
-rm -rf $(srcdir)/html
-rm -f $(srcdir)/libxml++.dvi $(srcdir)/libxml++.ps $(srcdir)/libxml++.pdf $(srcdir)/libxml++-html.tar.gz
......@@ -81,14 +81,15 @@ int main(int argc, char* argv[])
#ifdef LIBXMLCPP_EXCEPTIONS_ENABLED
try
{
#endif //LIBXMLCPP_EXCEPTIONS_ENABLED
contents_ucs2 = Glib::convert(contents, "UCS-2", "UTF-8");
#ifdef LIBXMLCPP_EXCEPTIONS_ENABLED
}
catch(const Glib::Error& ex)
{
std::cerr << "Glib::convert failed: " << ex.what() << std::endl;
}
#else
std::auto_ptr<Glib::Error> error;
contents_ucs2 = Glib::convert(contents, "UCS-2", "UTF-8", error);
#endif //LIBXMLCPP_EXCEPTIONS_ENABLED
parser.parse_memory_raw((const unsigned char*)contents_ucs2.c_str(), contents_ucs2.size());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment