From: JinWang An Date: Fri, 23 Oct 2020 11:10:12 +0000 (+0900) Subject: Imported Upstream version 2.35.2 X-Git-Tag: upstream/2.35.2^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d901f27daf5bb89462aa87a50aa6873c82f9fe1a;p=platform%2Fupstream%2Flibxml%2B%2B.git Imported Upstream version 2.35.2 --- diff --git a/ChangeLog b/ChangeLog index 7be3967..10e5294 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,36 @@ +2.35.2: + +2012-03-21 Murray Cumming + + Fix a warning found by clang++ + + * libxml++/parsers/textreader.h: PropertyReader is a class, not + a struct. + +2012-03-20 Murray Cumming + + Remove the --disable-api-exceptions configure option. + + And remove the #ifdefs and #else blocks from the code. + This is not used by anybody now, as far as I know, so this makes the + code easier to maintain. + +2012-03-20 Murray Cumming + + A fix for the previous commit. + + * libxml++/nodes/node.cc: get_first_child() const: Use the name + parameter. + +2012-03-19 Murray Cumming + + Node: Add get_first_child(). + + * libxml++/nodes/node.[h|cc]: This is like get_children(), + but it returns only the first node, optionally returning + the first one with a certain name. + Based on a patch by Ilya Murav'jov in bug #648125 . + 2.35.1: 2012-02-15 Kjell Ahlstedt diff --git a/INSTALL b/INSTALL index 7d1c323..a1e89e1 100644 --- a/INSTALL +++ b/INSTALL @@ -1,8 +1,8 @@ Installation Instructions ************************* -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007, 2008, 2009 Free Software Foundation, Inc. +Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation, +Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright @@ -226,6 +226,11 @@ order to use an ANSI C compiler: and if that doesn't work, install pre-built binaries of GCC for HP-UX. + HP-UX `make' updates targets which have the same time stamps as +their prerequisites, which makes it generally unusable when shipped +generated files such as `configure' are involved. Use GNU `make' +instead. + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot parse its `' header file. The option `-nodtk' can be used as a workaround. If GNU CC is not installed, it is therefore recommended diff --git a/MSVC_Net2005/libxml++/libxml++.rc b/MSVC_Net2005/libxml++/libxml++.rc index c7389e3..3fc22f0 100644 --- a/MSVC_Net2005/libxml++/libxml++.rc +++ b/MSVC_Net2005/libxml++/libxml++.rc @@ -33,8 +33,8 @@ END #endif // APSTUDIO_INVOKED VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,35,1,1 - PRODUCTVERSION 2,35,1,1 + FILEVERSION 2,35,2,1 + PRODUCTVERSION 2,35,2,1 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -51,11 +51,11 @@ BEGIN BEGIN VALUE "CompanyName", "The libxml++ development team (see AUTHORS)" VALUE "FileDescription", "The official C++ wrapper for libxml2" - VALUE "FileVersion", "2.35.1" + VALUE "FileVersion", "2.35.2" VALUE "LegalCopyright", "Distribution is under the LGPL (see COPYING)" VALUE "OriginalFilename", "libxml++-2.6" VALUE "ProductName", "libxml++" - VALUE "ProductVersion", "2.35.1" + VALUE "ProductVersion", "2.35.2" END END BLOCK "VarFileInfo" diff --git a/MSVC_Net2005/libxml++/libxml++config.h b/MSVC_Net2005/libxml++/libxml++config.h index 71b9996..2cd4768 100644 --- a/MSVC_Net2005/libxml++/libxml++config.h +++ b/MSVC_Net2005/libxml++/libxml++config.h @@ -7,7 +7,7 @@ #ifdef GLIBMM_CONFIGURE /* compiler feature tests that are used during compile time and run-time by libxml++ only. */ -#define LIBXMLCPP_EXCEPTIONS_ENABLED 1 +/* #undef LIBXMLCPP_EXCEPTIONS_ENABLED */ #endif /* GLIBMM_CONFIGURE */ #ifdef GLIBMM_MSC diff --git a/MSVC_Net2008/libxml++/libxml++.rc b/MSVC_Net2008/libxml++/libxml++.rc index c7389e3..3fc22f0 100644 --- a/MSVC_Net2008/libxml++/libxml++.rc +++ b/MSVC_Net2008/libxml++/libxml++.rc @@ -33,8 +33,8 @@ END #endif // APSTUDIO_INVOKED VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,35,1,1 - PRODUCTVERSION 2,35,1,1 + FILEVERSION 2,35,2,1 + PRODUCTVERSION 2,35,2,1 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -51,11 +51,11 @@ BEGIN BEGIN VALUE "CompanyName", "The libxml++ development team (see AUTHORS)" VALUE "FileDescription", "The official C++ wrapper for libxml2" - VALUE "FileVersion", "2.35.1" + VALUE "FileVersion", "2.35.2" VALUE "LegalCopyright", "Distribution is under the LGPL (see COPYING)" VALUE "OriginalFilename", "libxml++-2.6" VALUE "ProductName", "libxml++" - VALUE "ProductVersion", "2.35.1" + VALUE "ProductVersion", "2.35.2" END END BLOCK "VarFileInfo" diff --git a/MSVC_Net2008/libxml++/libxml++config.h b/MSVC_Net2008/libxml++/libxml++config.h index 71b9996..2cd4768 100644 --- a/MSVC_Net2008/libxml++/libxml++config.h +++ b/MSVC_Net2008/libxml++/libxml++config.h @@ -7,7 +7,7 @@ #ifdef GLIBMM_CONFIGURE /* compiler feature tests that are used during compile time and run-time by libxml++ only. */ -#define LIBXMLCPP_EXCEPTIONS_ENABLED 1 +/* #undef LIBXMLCPP_EXCEPTIONS_ENABLED */ #endif /* GLIBMM_CONFIGURE */ #ifdef GLIBMM_MSC diff --git a/MSVC_Net2010/libxml++/libxml++.rc b/MSVC_Net2010/libxml++/libxml++.rc index 5c48d37..121aa1e 100644 --- a/MSVC_Net2010/libxml++/libxml++.rc +++ b/MSVC_Net2010/libxml++/libxml++.rc @@ -33,8 +33,8 @@ END #endif // APSTUDIO_INVOKED VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,35,1,1 - PRODUCTVERSION 2,35,1,1 + FILEVERSION 2,35,2,1 + PRODUCTVERSION 2,35,2,1 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -51,11 +51,11 @@ BEGIN BEGIN VALUE "CompanyName", "The libxml++ development team (see AUTHORS)" VALUE "FileDescription", "The official C++ wrapper for libxml2" - VALUE "FileVersion", "2.35.1" + VALUE "FileVersion", "2.35.2" VALUE "LegalCopyright", "Distribution is under the LGPL (see COPYING)" VALUE "OriginalFilename", "libxml++-2.6" VALUE "ProductName", "libxml++" - VALUE "ProductVersion", "2.35.1" + VALUE "ProductVersion", "2.35.2" END END BLOCK "VarFileInfo" diff --git a/MSVC_Net2010/libxml++/libxml++config.h b/MSVC_Net2010/libxml++/libxml++config.h index 71b9996..2cd4768 100644 --- a/MSVC_Net2010/libxml++/libxml++config.h +++ b/MSVC_Net2010/libxml++/libxml++config.h @@ -7,7 +7,7 @@ #ifdef GLIBMM_CONFIGURE /* compiler feature tests that are used during compile time and run-time by libxml++ only. */ -#define LIBXMLCPP_EXCEPTIONS_ENABLED 1 +/* #undef LIBXMLCPP_EXCEPTIONS_ENABLED */ #endif /* GLIBMM_CONFIGURE */ #ifdef GLIBMM_MSC diff --git a/Makefile.in b/Makefile.in index e6e15f3..327e0c6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -78,8 +78,7 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/libtool.m4 \ $(top_srcdir)/macros/ltoptions.m4 \ $(top_srcdir)/macros/ltsugar.m4 \ $(top_srcdir)/macros/ltversion.m4 \ - $(top_srcdir)/macros/lt~obsolete.m4 \ - $(top_srcdir)/macros/reduced.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/macros/lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -112,6 +111,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(referencedir)" \ "$(DESTDIR)$(library_configdir)" "$(DESTDIR)$(pkgconfigdir)" \ "$(DESTDIR)$(library_exceptions_includedir)" \ @@ -153,8 +158,8 @@ am_libxml___libxml___@LIBXMLXX_API_VERSION@_la_OBJECTS = \ $(am__objects_1) $(am__objects_3) libxml___libxml___@LIBXMLXX_API_VERSION@_la_OBJECTS = \ $(am_libxml___libxml___@LIBXMLXX_API_VERSION@_la_OBJECTS) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent libxml___libxml___@LIBXMLXX_API_VERSION@_la_LINK = $(LIBTOOL) \ $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ @@ -300,18 +305,18 @@ LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CXXFLAGS) $(CXXFLAGS) -AM_V_CXX = $(am__v_CXX_$(V)) -am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY)) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) am__v_CXX_0 = @echo " CXX " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CXXLD = $(am__v_CXXLD_$(V)) -am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY)) +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) am__v_CXXLD_0 = @echo " CXXLD " $@; COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -319,18 +324,18 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) am__v_CC_0 = @echo " CC " $@; CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libxml___libxml___@LIBXMLXX_API_VERSION@_la_SOURCES) \ $(examples_dom_build_dom_build_SOURCES) \ @@ -481,12 +486,16 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) am__remove_distdir = \ - { test ! -d "$(distdir)" \ - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr "$(distdir)"; }; } + if test -d "$(distdir)"; then \ + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -rf "$(distdir)" \ + || { sleep 5 && rm -rf "$(distdir)"; }; \ + else :; fi DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 GZIP_ENV = --best distuninstallcheck_listfiles = find . -type f -print +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ ACLOCAL_FLAGS = @ACLOCAL_FLAGS@ @@ -1140,7 +1149,7 @@ all: config.h libxml++config.h .SUFFIXES: .SUFFIXES: .cc .lo .o .obj -am--refresh: +am--refresh: Makefile @: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/macros/doc-reference.am $(am__configure_deps) @for dep in $?; do \ @@ -1165,6 +1174,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/macros/doc-reference.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck @@ -1176,10 +1186,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then \ - rm -f stamp-h1; \ - $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ - else :; fi + @if test ! -f $@; then rm -f stamp-h1; else :; fi + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -1190,10 +1198,8 @@ $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) touch $@ libxml++config.h: stamp-h2 - @if test ! -f $@; then \ - rm -f stamp-h2; \ - $(MAKE) $(AM_MAKEFLAGS) stamp-h2; \ - else :; fi + @if test ! -f $@; then rm -f stamp-h2; else :; fi + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h2; else :; fi stamp-h2: $(srcdir)/libxml++config.h.in $(top_builddir)/config.status @rm -f stamp-h2 @@ -1348,7 +1354,7 @@ libxml++/validators/schemavalidator.lo: \ libxml++/validators/$(DEPDIR)/$(am__dirstamp) libxml++/validators/validator.lo: libxml++/validators/$(am__dirstamp) \ libxml++/validators/$(DEPDIR)/$(am__dirstamp) -libxml++/libxml++-@LIBXMLXX_API_VERSION@.la: $(libxml___libxml___@LIBXMLXX_API_VERSION@_la_OBJECTS) $(libxml___libxml___@LIBXMLXX_API_VERSION@_la_DEPENDENCIES) libxml++/$(am__dirstamp) +libxml++/libxml++-@LIBXMLXX_API_VERSION@.la: $(libxml___libxml___@LIBXMLXX_API_VERSION@_la_OBJECTS) $(libxml___libxml___@LIBXMLXX_API_VERSION@_la_DEPENDENCIES) $(EXTRA_libxml___libxml___@LIBXMLXX_API_VERSION@_la_DEPENDENCIES) libxml++/$(am__dirstamp) $(AM_V_CXXLD)$(libxml___libxml___@LIBXMLXX_API_VERSION@_la_LINK) -rpath $(libdir) $(libxml___libxml___@LIBXMLXX_API_VERSION@_la_OBJECTS) $(libxml___libxml___@LIBXMLXX_API_VERSION@_la_LIBADD) $(LIBS) clean-noinstPROGRAMS: @@ -1367,7 +1373,7 @@ examples/dom_build/$(DEPDIR)/$(am__dirstamp): @: > examples/dom_build/$(DEPDIR)/$(am__dirstamp) examples/dom_build/main.$(OBJEXT): examples/dom_build/$(am__dirstamp) \ examples/dom_build/$(DEPDIR)/$(am__dirstamp) -examples/dom_build/dom_build$(EXEEXT): $(examples_dom_build_dom_build_OBJECTS) $(examples_dom_build_dom_build_DEPENDENCIES) examples/dom_build/$(am__dirstamp) +examples/dom_build/dom_build$(EXEEXT): $(examples_dom_build_dom_build_OBJECTS) $(examples_dom_build_dom_build_DEPENDENCIES) $(EXTRA_examples_dom_build_dom_build_DEPENDENCIES) examples/dom_build/$(am__dirstamp) @rm -f examples/dom_build/dom_build$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(examples_dom_build_dom_build_OBJECTS) $(examples_dom_build_dom_build_LDADD) $(LIBS) examples/dom_parse_entities/$(am__dirstamp): @@ -1379,7 +1385,7 @@ examples/dom_parse_entities/$(DEPDIR)/$(am__dirstamp): examples/dom_parse_entities/main.$(OBJEXT): \ examples/dom_parse_entities/$(am__dirstamp) \ examples/dom_parse_entities/$(DEPDIR)/$(am__dirstamp) -examples/dom_parse_entities/dom_parse_entities$(EXEEXT): $(examples_dom_parse_entities_dom_parse_entities_OBJECTS) $(examples_dom_parse_entities_dom_parse_entities_DEPENDENCIES) examples/dom_parse_entities/$(am__dirstamp) +examples/dom_parse_entities/dom_parse_entities$(EXEEXT): $(examples_dom_parse_entities_dom_parse_entities_OBJECTS) $(examples_dom_parse_entities_dom_parse_entities_DEPENDENCIES) $(EXTRA_examples_dom_parse_entities_dom_parse_entities_DEPENDENCIES) examples/dom_parse_entities/$(am__dirstamp) @rm -f examples/dom_parse_entities/dom_parse_entities$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(examples_dom_parse_entities_dom_parse_entities_OBJECTS) $(examples_dom_parse_entities_dom_parse_entities_LDADD) $(LIBS) examples/dom_parser/$(am__dirstamp): @@ -1391,7 +1397,7 @@ examples/dom_parser/$(DEPDIR)/$(am__dirstamp): examples/dom_parser/main.$(OBJEXT): \ examples/dom_parser/$(am__dirstamp) \ examples/dom_parser/$(DEPDIR)/$(am__dirstamp) -examples/dom_parser/dom_parser$(EXEEXT): $(examples_dom_parser_dom_parser_OBJECTS) $(examples_dom_parser_dom_parser_DEPENDENCIES) examples/dom_parser/$(am__dirstamp) +examples/dom_parser/dom_parser$(EXEEXT): $(examples_dom_parser_dom_parser_OBJECTS) $(examples_dom_parser_dom_parser_DEPENDENCIES) $(EXTRA_examples_dom_parser_dom_parser_DEPENDENCIES) examples/dom_parser/$(am__dirstamp) @rm -f examples/dom_parser/dom_parser$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(examples_dom_parser_dom_parser_OBJECTS) $(examples_dom_parser_dom_parser_LDADD) $(LIBS) examples/dom_parser_raw/$(am__dirstamp): @@ -1403,7 +1409,7 @@ examples/dom_parser_raw/$(DEPDIR)/$(am__dirstamp): examples/dom_parser_raw/main.$(OBJEXT): \ examples/dom_parser_raw/$(am__dirstamp) \ examples/dom_parser_raw/$(DEPDIR)/$(am__dirstamp) -examples/dom_parser_raw/dom_parser_raw$(EXEEXT): $(examples_dom_parser_raw_dom_parser_raw_OBJECTS) $(examples_dom_parser_raw_dom_parser_raw_DEPENDENCIES) examples/dom_parser_raw/$(am__dirstamp) +examples/dom_parser_raw/dom_parser_raw$(EXEEXT): $(examples_dom_parser_raw_dom_parser_raw_OBJECTS) $(examples_dom_parser_raw_dom_parser_raw_DEPENDENCIES) $(EXTRA_examples_dom_parser_raw_dom_parser_raw_DEPENDENCIES) examples/dom_parser_raw/$(am__dirstamp) @rm -f examples/dom_parser_raw/dom_parser_raw$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(examples_dom_parser_raw_dom_parser_raw_OBJECTS) $(examples_dom_parser_raw_dom_parser_raw_LDADD) $(LIBS) examples/dom_read_write/$(am__dirstamp): @@ -1415,7 +1421,7 @@ examples/dom_read_write/$(DEPDIR)/$(am__dirstamp): examples/dom_read_write/main.$(OBJEXT): \ examples/dom_read_write/$(am__dirstamp) \ examples/dom_read_write/$(DEPDIR)/$(am__dirstamp) -examples/dom_read_write/dom_read_write$(EXEEXT): $(examples_dom_read_write_dom_read_write_OBJECTS) $(examples_dom_read_write_dom_read_write_DEPENDENCIES) examples/dom_read_write/$(am__dirstamp) +examples/dom_read_write/dom_read_write$(EXEEXT): $(examples_dom_read_write_dom_read_write_OBJECTS) $(examples_dom_read_write_dom_read_write_DEPENDENCIES) $(EXTRA_examples_dom_read_write_dom_read_write_DEPENDENCIES) examples/dom_read_write/$(am__dirstamp) @rm -f examples/dom_read_write/dom_read_write$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(examples_dom_read_write_dom_read_write_OBJECTS) $(examples_dom_read_write_dom_read_write_LDADD) $(LIBS) examples/dom_xpath/$(am__dirstamp): @@ -1426,7 +1432,7 @@ examples/dom_xpath/$(DEPDIR)/$(am__dirstamp): @: > examples/dom_xpath/$(DEPDIR)/$(am__dirstamp) examples/dom_xpath/main.$(OBJEXT): examples/dom_xpath/$(am__dirstamp) \ examples/dom_xpath/$(DEPDIR)/$(am__dirstamp) -examples/dom_xpath/dom_xpath$(EXEEXT): $(examples_dom_xpath_dom_xpath_OBJECTS) $(examples_dom_xpath_dom_xpath_DEPENDENCIES) examples/dom_xpath/$(am__dirstamp) +examples/dom_xpath/dom_xpath$(EXEEXT): $(examples_dom_xpath_dom_xpath_OBJECTS) $(examples_dom_xpath_dom_xpath_DEPENDENCIES) $(EXTRA_examples_dom_xpath_dom_xpath_DEPENDENCIES) examples/dom_xpath/$(am__dirstamp) @rm -f examples/dom_xpath/dom_xpath$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(examples_dom_xpath_dom_xpath_OBJECTS) $(examples_dom_xpath_dom_xpath_LDADD) $(LIBS) examples/dtdvalidation/$(am__dirstamp): @@ -1438,7 +1444,7 @@ examples/dtdvalidation/$(DEPDIR)/$(am__dirstamp): examples/dtdvalidation/main.$(OBJEXT): \ examples/dtdvalidation/$(am__dirstamp) \ examples/dtdvalidation/$(DEPDIR)/$(am__dirstamp) -examples/dtdvalidation/dtdvalidation$(EXEEXT): $(examples_dtdvalidation_dtdvalidation_OBJECTS) $(examples_dtdvalidation_dtdvalidation_DEPENDENCIES) examples/dtdvalidation/$(am__dirstamp) +examples/dtdvalidation/dtdvalidation$(EXEEXT): $(examples_dtdvalidation_dtdvalidation_OBJECTS) $(examples_dtdvalidation_dtdvalidation_DEPENDENCIES) $(EXTRA_examples_dtdvalidation_dtdvalidation_DEPENDENCIES) examples/dtdvalidation/$(am__dirstamp) @rm -f examples/dtdvalidation/dtdvalidation$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(examples_dtdvalidation_dtdvalidation_OBJECTS) $(examples_dtdvalidation_dtdvalidation_LDADD) $(LIBS) examples/import_node/$(am__dirstamp): @@ -1450,7 +1456,7 @@ examples/import_node/$(DEPDIR)/$(am__dirstamp): examples/import_node/main.$(OBJEXT): \ examples/import_node/$(am__dirstamp) \ examples/import_node/$(DEPDIR)/$(am__dirstamp) -examples/import_node/import_node$(EXEEXT): $(examples_import_node_import_node_OBJECTS) $(examples_import_node_import_node_DEPENDENCIES) examples/import_node/$(am__dirstamp) +examples/import_node/import_node$(EXEEXT): $(examples_import_node_import_node_OBJECTS) $(examples_import_node_import_node_DEPENDENCIES) $(EXTRA_examples_import_node_import_node_DEPENDENCIES) examples/import_node/$(am__dirstamp) @rm -f examples/import_node/import_node$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(examples_import_node_import_node_OBJECTS) $(examples_import_node_import_node_LDADD) $(LIBS) examples/sax_exception/$(am__dirstamp): @@ -1465,7 +1471,7 @@ examples/sax_exception/main.$(OBJEXT): \ examples/sax_exception/myparser.$(OBJEXT): \ examples/sax_exception/$(am__dirstamp) \ examples/sax_exception/$(DEPDIR)/$(am__dirstamp) -examples/sax_exception/sax_exception$(EXEEXT): $(examples_sax_exception_sax_exception_OBJECTS) $(examples_sax_exception_sax_exception_DEPENDENCIES) examples/sax_exception/$(am__dirstamp) +examples/sax_exception/sax_exception$(EXEEXT): $(examples_sax_exception_sax_exception_OBJECTS) $(examples_sax_exception_sax_exception_DEPENDENCIES) $(EXTRA_examples_sax_exception_sax_exception_DEPENDENCIES) examples/sax_exception/$(am__dirstamp) @rm -f examples/sax_exception/sax_exception$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(examples_sax_exception_sax_exception_OBJECTS) $(examples_sax_exception_sax_exception_LDADD) $(LIBS) examples/sax_parser/$(am__dirstamp): @@ -1480,7 +1486,7 @@ examples/sax_parser/main.$(OBJEXT): \ examples/sax_parser/myparser.$(OBJEXT): \ examples/sax_parser/$(am__dirstamp) \ examples/sax_parser/$(DEPDIR)/$(am__dirstamp) -examples/sax_parser/sax_parser$(EXEEXT): $(examples_sax_parser_sax_parser_OBJECTS) $(examples_sax_parser_sax_parser_DEPENDENCIES) examples/sax_parser/$(am__dirstamp) +examples/sax_parser/sax_parser$(EXEEXT): $(examples_sax_parser_sax_parser_OBJECTS) $(examples_sax_parser_sax_parser_DEPENDENCIES) $(EXTRA_examples_sax_parser_sax_parser_DEPENDENCIES) examples/sax_parser/$(am__dirstamp) @rm -f examples/sax_parser/sax_parser$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(examples_sax_parser_sax_parser_OBJECTS) $(examples_sax_parser_sax_parser_LDADD) $(LIBS) examples/sax_parser_build_dom/$(am__dirstamp): @@ -1501,7 +1507,7 @@ examples/sax_parser_build_dom/svgdocument.$(OBJEXT): \ examples/sax_parser_build_dom/svgelement.$(OBJEXT): \ examples/sax_parser_build_dom/$(am__dirstamp) \ examples/sax_parser_build_dom/$(DEPDIR)/$(am__dirstamp) -examples/sax_parser_build_dom/sax_parser_build_dom$(EXEEXT): $(examples_sax_parser_build_dom_sax_parser_build_dom_OBJECTS) $(examples_sax_parser_build_dom_sax_parser_build_dom_DEPENDENCIES) examples/sax_parser_build_dom/$(am__dirstamp) +examples/sax_parser_build_dom/sax_parser_build_dom$(EXEEXT): $(examples_sax_parser_build_dom_sax_parser_build_dom_OBJECTS) $(examples_sax_parser_build_dom_sax_parser_build_dom_DEPENDENCIES) $(EXTRA_examples_sax_parser_build_dom_sax_parser_build_dom_DEPENDENCIES) examples/sax_parser_build_dom/$(am__dirstamp) @rm -f examples/sax_parser_build_dom/sax_parser_build_dom$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(examples_sax_parser_build_dom_sax_parser_build_dom_OBJECTS) $(examples_sax_parser_build_dom_sax_parser_build_dom_LDADD) $(LIBS) examples/sax_parser_entities/$(am__dirstamp): @@ -1516,7 +1522,7 @@ examples/sax_parser_entities/main.$(OBJEXT): \ examples/sax_parser_entities/myparser.$(OBJEXT): \ examples/sax_parser_entities/$(am__dirstamp) \ examples/sax_parser_entities/$(DEPDIR)/$(am__dirstamp) -examples/sax_parser_entities/sax_parser_entities$(EXEEXT): $(examples_sax_parser_entities_sax_parser_entities_OBJECTS) $(examples_sax_parser_entities_sax_parser_entities_DEPENDENCIES) examples/sax_parser_entities/$(am__dirstamp) +examples/sax_parser_entities/sax_parser_entities$(EXEEXT): $(examples_sax_parser_entities_sax_parser_entities_OBJECTS) $(examples_sax_parser_entities_sax_parser_entities_DEPENDENCIES) $(EXTRA_examples_sax_parser_entities_sax_parser_entities_DEPENDENCIES) examples/sax_parser_entities/$(am__dirstamp) @rm -f examples/sax_parser_entities/sax_parser_entities$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(examples_sax_parser_entities_sax_parser_entities_OBJECTS) $(examples_sax_parser_entities_sax_parser_entities_LDADD) $(LIBS) examples/schemavalidation/$(am__dirstamp): @@ -1528,7 +1534,7 @@ examples/schemavalidation/$(DEPDIR)/$(am__dirstamp): examples/schemavalidation/main.$(OBJEXT): \ examples/schemavalidation/$(am__dirstamp) \ examples/schemavalidation/$(DEPDIR)/$(am__dirstamp) -examples/schemavalidation/schemavalidation$(EXEEXT): $(examples_schemavalidation_schemavalidation_OBJECTS) $(examples_schemavalidation_schemavalidation_DEPENDENCIES) examples/schemavalidation/$(am__dirstamp) +examples/schemavalidation/schemavalidation$(EXEEXT): $(examples_schemavalidation_schemavalidation_OBJECTS) $(examples_schemavalidation_schemavalidation_DEPENDENCIES) $(EXTRA_examples_schemavalidation_schemavalidation_DEPENDENCIES) examples/schemavalidation/$(am__dirstamp) @rm -f examples/schemavalidation/schemavalidation$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(examples_schemavalidation_schemavalidation_OBJECTS) $(examples_schemavalidation_schemavalidation_LDADD) $(LIBS) examples/textreader/$(am__dirstamp): @@ -1540,7 +1546,7 @@ examples/textreader/$(DEPDIR)/$(am__dirstamp): examples/textreader/main.$(OBJEXT): \ examples/textreader/$(am__dirstamp) \ examples/textreader/$(DEPDIR)/$(am__dirstamp) -examples/textreader/textreader$(EXEEXT): $(examples_textreader_textreader_OBJECTS) $(examples_textreader_textreader_DEPENDENCIES) examples/textreader/$(am__dirstamp) +examples/textreader/textreader$(EXEEXT): $(examples_textreader_textreader_OBJECTS) $(examples_textreader_textreader_DEPENDENCIES) $(EXTRA_examples_textreader_textreader_DEPENDENCIES) examples/textreader/$(am__dirstamp) @rm -f examples/textreader/textreader$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(examples_textreader_textreader_OBJECTS) $(examples_textreader_textreader_LDADD) $(LIBS) @@ -1691,28 +1697,25 @@ distclean-compile: @am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ @am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po -@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: @am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ @am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po -@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: @am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ @am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ @am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo -@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -1759,9 +1762,7 @@ uninstall-dist_referenceDATA: @$(NORMAL_UNINSTALL) @list='$(dist_reference_DATA)'; test -n "$(referencedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(referencedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(referencedir)" && rm -f $$files + dir='$(DESTDIR)$(referencedir)'; $(am__uninstall_files_from_dir) install-library_configDATA: $(library_config_DATA) @$(NORMAL_INSTALL) test -z "$(library_configdir)" || $(MKDIR_P) "$(DESTDIR)$(library_configdir)" @@ -1779,9 +1780,7 @@ uninstall-library_configDATA: @$(NORMAL_UNINSTALL) @list='$(library_config_DATA)'; test -n "$(library_configdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(library_configdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(library_configdir)" && rm -f $$files + dir='$(DESTDIR)$(library_configdir)'; $(am__uninstall_files_from_dir) install-nodist_pkgconfigDATA: $(nodist_pkgconfig_DATA) @$(NORMAL_INSTALL) test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" @@ -1799,9 +1798,7 @@ uninstall-nodist_pkgconfigDATA: @$(NORMAL_UNINSTALL) @list='$(nodist_pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files + dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) install-library_exceptions_includeHEADERS: $(library_exceptions_include_HEADERS) @$(NORMAL_INSTALL) test -z "$(library_exceptions_includedir)" || $(MKDIR_P) "$(DESTDIR)$(library_exceptions_includedir)" @@ -1819,9 +1816,7 @@ uninstall-library_exceptions_includeHEADERS: @$(NORMAL_UNINSTALL) @list='$(library_exceptions_include_HEADERS)'; test -n "$(library_exceptions_includedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(library_exceptions_includedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(library_exceptions_includedir)" && rm -f $$files + dir='$(DESTDIR)$(library_exceptions_includedir)'; $(am__uninstall_files_from_dir) install-library_includeHEADERS: $(library_include_HEADERS) @$(NORMAL_INSTALL) test -z "$(library_includedir)" || $(MKDIR_P) "$(DESTDIR)$(library_includedir)" @@ -1839,9 +1834,7 @@ uninstall-library_includeHEADERS: @$(NORMAL_UNINSTALL) @list='$(library_include_HEADERS)'; test -n "$(library_includedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(library_includedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(library_includedir)" && rm -f $$files + dir='$(DESTDIR)$(library_includedir)'; $(am__uninstall_files_from_dir) install-library_io_includeHEADERS: $(library_io_include_HEADERS) @$(NORMAL_INSTALL) test -z "$(library_io_includedir)" || $(MKDIR_P) "$(DESTDIR)$(library_io_includedir)" @@ -1859,9 +1852,7 @@ uninstall-library_io_includeHEADERS: @$(NORMAL_UNINSTALL) @list='$(library_io_include_HEADERS)'; test -n "$(library_io_includedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(library_io_includedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(library_io_includedir)" && rm -f $$files + dir='$(DESTDIR)$(library_io_includedir)'; $(am__uninstall_files_from_dir) install-library_nodes_includeHEADERS: $(library_nodes_include_HEADERS) @$(NORMAL_INSTALL) test -z "$(library_nodes_includedir)" || $(MKDIR_P) "$(DESTDIR)$(library_nodes_includedir)" @@ -1879,9 +1870,7 @@ uninstall-library_nodes_includeHEADERS: @$(NORMAL_UNINSTALL) @list='$(library_nodes_include_HEADERS)'; test -n "$(library_nodes_includedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(library_nodes_includedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(library_nodes_includedir)" && rm -f $$files + dir='$(DESTDIR)$(library_nodes_includedir)'; $(am__uninstall_files_from_dir) install-library_parsers_includeHEADERS: $(library_parsers_include_HEADERS) @$(NORMAL_INSTALL) test -z "$(library_parsers_includedir)" || $(MKDIR_P) "$(DESTDIR)$(library_parsers_includedir)" @@ -1899,9 +1888,7 @@ uninstall-library_parsers_includeHEADERS: @$(NORMAL_UNINSTALL) @list='$(library_parsers_include_HEADERS)'; test -n "$(library_parsers_includedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(library_parsers_includedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(library_parsers_includedir)" && rm -f $$files + dir='$(DESTDIR)$(library_parsers_includedir)'; $(am__uninstall_files_from_dir) install-library_validators_includeHEADERS: $(library_validators_include_HEADERS) @$(NORMAL_INSTALL) test -z "$(library_validators_includedir)" || $(MKDIR_P) "$(DESTDIR)$(library_validators_includedir)" @@ -1919,9 +1906,7 @@ uninstall-library_validators_includeHEADERS: @$(NORMAL_UNINSTALL) @list='$(library_validators_include_HEADERS)'; test -n "$(library_validators_includedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(library_validators_includedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(library_validators_includedir)" && rm -f $$files + dir='$(DESTDIR)$(library_validators_includedir)'; $(am__uninstall_files_from_dir) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -2018,7 +2003,11 @@ dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 + $(am__remove_distdir) + +dist-lzip: distdir + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz $(am__remove_distdir) dist-lzma: distdir @@ -2026,7 +2015,7 @@ dist-lzma: distdir $(am__remove_distdir) dist-xz: distdir - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__remove_distdir) dist-tarZ: distdir @@ -2044,7 +2033,7 @@ dist-zip: distdir dist dist-all: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 $(am__remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then @@ -2058,6 +2047,8 @@ distcheck: dist bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lzma*) \ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.lz*) \ + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ @@ -2077,6 +2068,7 @@ distcheck: dist && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ @@ -2105,8 +2097,16 @@ distcheck: dist list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: - @$(am__cd) '$(distuninstallcheck_dir)' \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + @test -n '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: trying to run $@ with an empty' \ + '$$(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + $(am__cd) '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ || { echo "ERROR: files left after uninstall:" ; \ if test -n "$(DESTDIR)"; then \ echo " (check DESTDIR support)"; \ @@ -2141,10 +2141,15 @@ install-am: all-am installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -2295,11 +2300,11 @@ uninstall-am: uninstall-dist_referenceDATA uninstall-libLTLIBRARIES \ .PHONY: CTAGS GTAGS all all-am all-local am--refresh check check-am \ clean clean-generic clean-libLTLIBRARIES clean-libtool \ clean-noinstPROGRAMS ctags dist dist-all dist-bzip2 dist-gzip \ - dist-lzma dist-shar dist-tarZ dist-xz dist-zip distcheck \ - distclean distclean-compile distclean-generic distclean-hdr \ - distclean-libtool distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am \ + dist-lzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \ + distcheck distclean distclean-compile distclean-generic \ + distclean-hdr distclean-libtool distclean-tags distcleancheck \ + distdir distuninstallcheck dvi dvi-am html html-am info \ + info-am install install-am install-data install-data-am \ install-data-local install-dist_referenceDATA install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am \ diff --git a/NEWS b/NEWS index 40e00da..34b67f4 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,10 @@ +2.35.2 (unstable): + +* Node: Add get_first_child(). + (Murray Cumming, Based on a patch by Ilya Murav'jov in bug #648125) +* Build: Remove the --disable-api-exceptions configure option. + (Murray Cumming) + 2.35.1 (unstable): * Handle attributes with default values correctly. diff --git a/aclocal.m4 b/aclocal.m4 index 952b5e1..0dde6a9 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,7 +1,8 @@ -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- +# generated automatically by aclocal 1.11.3 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, +# Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -19,12 +20,15 @@ You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software +# Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been @@ -34,7 +38,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.11' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.1], [], +m4_if([$1], [1.11.3], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -50,19 +54,21 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.1])dnl +[AM_AUTOMAKE_VERSION([1.11.3])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to # `$srcdir', `$srcdir/..', or `$srcdir/../..'. @@ -144,14 +150,14 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 -# Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, +# 2010, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 10 +# serial 12 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -191,6 +197,7 @@ AC_CACHE_CHECK([dependency style of $depcc], # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -255,7 +262,7 @@ AC_CACHE_CHECK([dependency style of $depcc], break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | msvisualcpp | msvcmsys) # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. @@ -320,10 +327,13 @@ AC_DEFUN([AM_DEP_TRACK], if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) AC_SUBST([AMDEPBACKSLASH])dnl _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([am__nodep])dnl +_AM_SUBST_NOTMAKE([am__nodep])dnl ]) # Generate code to set up dependency tracking. -*- Autoconf -*- @@ -545,12 +555,15 @@ for _am_header in $config_headers :; do done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, +# Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. @@ -590,8 +603,8 @@ AC_SUBST([am__leading_dot])]) # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, +# 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -611,7 +624,7 @@ AC_DEFUN([AM_MAINTAINER_MODE], [disable], [m4_define([am_maintainer_other], [enable])], [m4_define([am_maintainer_other], [enable]) m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) -AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) +AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) dnl maintainer-mode's default is 'disable' unless 'enable' is passed AC_ARG_ENABLE([maintainer-mode], [ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful @@ -722,12 +735,15 @@ else fi ]) -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, +# Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_PROG_MKDIR_P # --------------- # Check for `mkdir -p'. @@ -750,13 +766,14 @@ esac # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software +# Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 +# serial 5 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -764,13 +781,13 @@ AC_DEFUN([_AM_MANGLE_OPTION], [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) # _AM_SET_OPTION(NAME) -# ------------------------------ +# -------------------- # Set option NAME. Presently that only means defining a flag for this option. AC_DEFUN([_AM_SET_OPTION], [m4_define(_AM_MANGLE_OPTION([$1]), 1)]) # _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- +# ------------------------ # OPTIONS is a space-separated list of Automake options. AC_DEFUN([_AM_SET_OPTIONS], [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) @@ -846,13 +863,13 @@ Check your system clock]) fi AC_MSG_RESULT(yes)]) -# Copyright (C) 2009 Free Software Foundation, Inc. +# Copyright (C) 2009, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 +# serial 2 # AM_SILENT_RULES([DEFAULT]) # -------------------------- @@ -867,18 +884,50 @@ yes) AM_DEFAULT_VERBOSITY=0;; no) AM_DEFAULT_VERBOSITY=1;; *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; esac +dnl +dnl A few `make' implementations (e.g., NonStop OS and NextStep) +dnl do not support nested variable expansions. +dnl See automake bug#9928 and bug#10237. +am_make=${MAKE-make} +AC_CACHE_CHECK([whether $am_make supports nested variables], + [am_cv_make_support_nested_variables], + [if AS_ECHO([['TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi]) +if test $am_cv_make_support_nested_variables = yes; then + dnl Using `$V' instead of `$(V)' breaks IRIX make. + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AC_SUBST([AM_V])dnl +AM_SUBST_NOTMAKE([AM_V])dnl +AC_SUBST([AM_DEFAULT_V])dnl +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl AC_SUBST([AM_DEFAULT_VERBOSITY])dnl AM_BACKSLASH='\' AC_SUBST([AM_BACKSLASH])dnl _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_PROG_INSTALL_STRIP # --------------------- # One issue with vendor `install' (even GNU) is that you can't @@ -901,13 +950,13 @@ fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 +# serial 3 # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- @@ -916,13 +965,13 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])]) AC_DEFUN([_AM_SUBST_NOTMAKE]) # AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- +# -------------------------- # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -944,10 +993,11 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # a tarball read from stdin. # $(am__untar) < result.tar AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], [m4_case([$1], [ustar],, [pax],, [m4_fatal([Unknown tar format])]) AC_MSG_CHECKING([how to create a $1 tar archive]) @@ -1545,4 +1595,3 @@ m4_include([macros/ltoptions.m4]) m4_include([macros/ltsugar.m4]) m4_include([macros/ltversion.m4]) m4_include([macros/lt~obsolete.m4]) -m4_include([macros/reduced.m4]) diff --git a/config.h.in b/config.h.in index 9df83bc..920dec8 100644 --- a/config.h.in +++ b/config.h.in @@ -39,9 +39,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H -/* Defined when the --enable-api-exceptions configure argument was given */ -#undef LIBXMLCPP_EXCEPTIONS_ENABLED - /* Major version number of libxml++. */ #undef LIBXMLXX_MAJOR_VERSION diff --git a/configure b/configure index 0cbfa3c..b58d0df 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for libxml++ 2.35.1. +# Generated by GNU Autoconf 2.68 for libxml++ 2.35.2. # # Report bugs to . # @@ -571,8 +571,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libxml++' PACKAGE_TARNAME='libxml++' -PACKAGE_VERSION='2.35.1' -PACKAGE_STRING='libxml++ 2.35.1' +PACKAGE_VERSION='2.35.2' +PACKAGE_STRING='libxml++ 2.35.2' PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=libxml%2B%2B' PACKAGE_URL='http://libxmlplusplus.sourceforge.net/' @@ -677,6 +677,7 @@ AS am__fastdepCXX_FALSE am__fastdepCXX_TRUE CXXDEPMODE +am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE @@ -706,6 +707,8 @@ MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE AM_BACKSLASH AM_DEFAULT_VERBOSITY +AM_DEFAULT_V +AM_V am__untar am__tar AMTAR @@ -781,7 +784,6 @@ with_gnu_ld with_sysroot enable_libtool_lock enable_examples -enable_api_exceptions enable_documentation with_glibmm_doc enable_warnings @@ -1353,7 +1355,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libxml++ 2.35.1 to adapt to many kinds of systems. +\`configure' configures libxml++ 2.35.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1423,7 +1425,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libxml++ 2.35.1:";; + short | recursive ) echo "Configuration of libxml++ 2.35.2:";; esac cat <<\_ACEOF @@ -1443,8 +1445,6 @@ Optional Features: optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) --enable-examples build the examples - --enable-api-exceptions Build exceptions API. - [default=yes] --disable-documentation do not build or install the documentation --enable-warnings[=min|max|fatal|no] set compiler pedantry level [default=min] @@ -1452,7 +1452,7 @@ Optional Features: Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-pic try to use only PIC/non-PIC objects [default=use + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-sysroot=DIR Search for dependent libraries within DIR @@ -1557,7 +1557,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libxml++ configure 2.35.1 +libxml++ configure 2.35.2 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2047,7 +2047,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libxml++ $as_me 2.35.1, which was +It was created by libxml++ $as_me 2.35.2, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2869,7 +2869,7 @@ fi # Define the identity of the package. PACKAGE='libxml++' - VERSION='2.35.1' + VERSION='2.35.2' # Some tools Automake needs. @@ -2890,11 +2890,11 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} # We need awk for the "check" target. The system "awk" is bad on # some platforms. -# Always define AMTAR for backward compatibility. +# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AMTAR='$${TAR-tar}' -AMTAR=${AMTAR-"${am_missing_run}tar"} - -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' +am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' @@ -2910,6 +2910,33 @@ yes) AM_DEFAULT_VERBOSITY=0;; no) AM_DEFAULT_VERBOSITY=1;; *) AM_DEFAULT_VERBOSITY=1;; esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi AM_BACKSLASH='\' @@ -2964,7 +2991,7 @@ fi LIBXMLXX_MODULE_NAME='libxml++-2.6' -LIBXMLXX_VERSION='2.35.1' +LIBXMLXX_VERSION='2.35.2' LIBXMLXX_API_VERSION='2.6' @@ -2978,10 +3005,10 @@ LIBXMLXX_MINOR_VERSION=35 $as_echo "#define LIBXMLXX_MINOR_VERSION 35" >>confdefs.h -LIBXMLXX_MICRO_VERSION=1 +LIBXMLXX_MICRO_VERSION=2 -$as_echo "#define LIBXMLXX_MICRO_VERSION 1" >>confdefs.h +$as_echo "#define LIBXMLXX_MICRO_VERSION 2" >>confdefs.h @@ -3560,6 +3587,7 @@ fi if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= @@ -3584,6 +3612,7 @@ else # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -3643,7 +3672,7 @@ else break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | msvisualcpp | msvcmsys) # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. @@ -3707,8 +3736,8 @@ esac -macro_version='2.4' -macro_revision='1.3293' +macro_version='2.4.2' +macro_revision='1.3337' @@ -4417,6 +4446,7 @@ else # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -4476,7 +4506,7 @@ else break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | msvisualcpp | msvcmsys) # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. @@ -5220,6 +5250,11 @@ else lt_cv_sys_max_cmd_len=196608 ;; + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -5259,7 +5294,7 @@ else # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do @@ -5685,7 +5720,7 @@ irix5* | irix6* | nonstopux*) lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -6323,13 +6358,13 @@ old_postuninstall_cmds= if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi case $host_os in @@ -6476,6 +6511,7 @@ for ac_symprfx in "" "_"; do # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -6864,7 +6900,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; } CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) +*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 @@ -6875,7 +6911,20 @@ sparc*-*solaris*) case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -7515,7 +7564,13 @@ else $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&5 + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&5 @@ -7526,6 +7581,7 @@ else fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 $as_echo "$lt_cv_apple_cc_single_mod" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } if ${lt_cv_ld_exported_symbols_list+:} false; then : @@ -7558,6 +7614,7 @@ rm -f core conftest.err conftest.$ac_objext \ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 $as_echo_n "checking for -force_load linker flag... " >&6; } if ${lt_cv_ld_force_load+:} false; then : @@ -7579,7 +7636,9 @@ _LT_EOF echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err _lt_result=$? - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&5 + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then lt_cv_ld_force_load=yes else cat conftest.err >&5 @@ -8291,7 +8350,22 @@ fi # Check whether --with-pic was given. if test "${with_pic+set}" = set; then : - withval=$with_pic; pic_mode="$withval" + withval=$with_pic; lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac else pic_mode=default fi @@ -8369,6 +8443,10 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool' + + + + test -z "$LN_S" && LN_S="ln -s" @@ -8828,7 +8906,9 @@ lt_prog_compiler_static= case $cc_basename in nvcc*) # Cuda Compiler Driver 2.2 lt_prog_compiler_wl='-Xlinker ' - lt_prog_compiler_pic='-Xcompiler -fPIC' + if test -n "$lt_prog_compiler_pic"; then + lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" + fi ;; esac else @@ -8919,18 +8999,33 @@ lt_prog_compiler_static= ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ F* | *Sun*Fortran*) + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' lt_prog_compiler_wl='' ;; + *Sun\ F* | *Sun*Fortran*) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='-Qoption ld ' + ;; *Sun\ C*) # Sun C 5.9 lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' lt_prog_compiler_wl='-Wl,' ;; + *Intel*\ [CF]*Compiler*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; + *Portland\ Group*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fpic' + lt_prog_compiler_static='-Bstatic' + ;; esac ;; esac @@ -9292,7 +9387,6 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie hardcode_direct=no hardcode_direct_absolute=no hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld= hardcode_libdir_separator= hardcode_minus_L=no hardcode_shlibpath_var=unsupported @@ -9545,8 +9639,7 @@ _LT_EOF xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ @@ -9926,6 +10019,7 @@ fi # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, )='true' enable_shared_with_static_runtimes=yes + exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' # Don't use ranlib old_postinstall_cmds='chmod 644 $oldlib' @@ -9971,6 +10065,7 @@ fi hardcode_shlibpath_var=unsupported if test "$lt_cv_ld_force_load" = "yes"; then whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + else whole_archive_flag_spec='' fi @@ -9999,10 +10094,6 @@ fi hardcode_shlibpath_var=no ;; - freebsd1*) - ld_shlibs=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -10015,7 +10106,7 @@ fi ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) + freebsd2.*) archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes hardcode_minus_L=yes @@ -10054,7 +10145,6 @@ fi fi if test "$with_gnu_ld" = no; then hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_flag_spec_ld='+b $libdir' hardcode_libdir_separator=: hardcode_direct=yes hardcode_direct_absolute=yes @@ -10678,11 +10768,6 @@ esac - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } @@ -10772,7 +10857,7 @@ need_version=unknown case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -10781,7 +10866,7 @@ aix3*) ;; aix[4-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -10846,7 +10931,7 @@ beos*) ;; bsdi[45]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -10985,7 +11070,7 @@ darwin* | rhapsody*) ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -10993,10 +11078,6 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -11004,7 +11085,7 @@ freebsd* | dragonfly*) objformat=`/usr/bin/objformat` else case $host_os in - freebsd[123]*) objformat=aout ;; + freebsd[23].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -11022,7 +11103,7 @@ freebsd* | dragonfly*) esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) @@ -11042,7 +11123,7 @@ freebsd* | dragonfly*) ;; gnu*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' @@ -11053,7 +11134,7 @@ gnu*) ;; haiku*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -11114,7 +11195,7 @@ hpux9* | hpux10* | hpux11*) ;; interix[3-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -11130,7 +11211,7 @@ irix5* | irix6* | nonstopux*) nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -11167,9 +11248,9 @@ linux*oldld* | linux*aout* | linux*coff*) dynamic_linker=no ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -11263,7 +11344,7 @@ netbsd*) ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -11332,7 +11413,7 @@ rdos*) ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -11357,7 +11438,7 @@ sunos4*) ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -11381,7 +11462,7 @@ sysv4 | sysv4.3*) sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -11412,7 +11493,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -11422,7 +11503,7 @@ tpf*) ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -12347,7 +12428,6 @@ export_dynamic_flag_spec_CXX= hardcode_direct_CXX=no hardcode_direct_absolute_CXX=no hardcode_libdir_flag_spec_CXX= -hardcode_libdir_flag_spec_ld_CXX= hardcode_libdir_separator_CXX= hardcode_minus_L_CXX=no hardcode_shlibpath_var_CXX=unsupported @@ -12931,6 +13011,7 @@ fi hardcode_shlibpath_var_CXX=unsupported if test "$lt_cv_ld_force_load" = "yes"; then whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + else whole_archive_flag_spec_CXX='' fi @@ -12975,7 +13056,7 @@ fi esac ;; - freebsd[12]*) + freebsd2.*) # C++ shared libraries reported to be fairly broken before # switch to ELF ld_shlibs_CXX=no @@ -13651,6 +13732,7 @@ _lt_libdeps_save_CFLAGS=$CFLAGS case "$CC $CFLAGS " in #( *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; +*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; esac if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 @@ -14440,7 +14522,9 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie ;; cygwin* | mingw* | cegcc*) case $cc_basename in - cl*) ;; + cl*) + exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + ;; *) export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' @@ -14596,8 +14680,6 @@ esac - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } @@ -14623,7 +14705,7 @@ need_version=unknown case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -14632,7 +14714,7 @@ aix3*) ;; aix[4-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -14697,7 +14779,7 @@ beos*) ;; bsdi[45]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -14834,7 +14916,7 @@ darwin* | rhapsody*) ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -14842,10 +14924,6 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -14853,7 +14931,7 @@ freebsd* | dragonfly*) objformat=`/usr/bin/objformat` else case $host_os in - freebsd[123]*) objformat=aout ;; + freebsd[23].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -14871,7 +14949,7 @@ freebsd* | dragonfly*) esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) @@ -14891,7 +14969,7 @@ freebsd* | dragonfly*) ;; gnu*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' @@ -14902,7 +14980,7 @@ gnu*) ;; haiku*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -14963,7 +15041,7 @@ hpux9* | hpux10* | hpux11*) ;; interix[3-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -14979,7 +15057,7 @@ irix5* | irix6* | nonstopux*) nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -15016,9 +15094,9 @@ linux*oldld* | linux*aout* | linux*coff*) dynamic_linker=no ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -15112,7 +15190,7 @@ netbsd*) ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -15181,7 +15259,7 @@ rdos*) ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -15206,7 +15284,7 @@ sunos4*) ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -15230,7 +15308,7 @@ sysv4 | sysv4.3*) sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -15261,7 +15339,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -15271,7 +15349,7 @@ tpf*) ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -15410,6 +15488,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + ac_config_commands="$ac_config_commands libtool" @@ -15673,24 +15753,6 @@ else fi -# Offer the ability to omit some API from the library, to reduce the code size: - - # Check whether --enable-api-exceptions was given. -if test "${enable_api_exceptions+set}" = set; then : - enableval=$enable_api_exceptions; libxmlcpp_enable_api_exceptions="$enableval" -else - libxmlcpp_enable_api_exceptions='yes' -fi - - - if test "x$libxmlcpp_enable_api_exceptions" = "xyes"; then - { - -$as_echo "#define LIBXMLCPP_EXCEPTIONS_ENABLED 1" >>confdefs.h - - } - fi - # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 @@ -16726,7 +16788,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libxml++ $as_me 2.35.1, which was +This file was extended by libxml++ $as_me 2.35.2, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16793,7 +16855,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libxml++ config.status 2.35.1 +libxml++ config.status 2.35.2 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" @@ -16933,6 +16995,7 @@ pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' +PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' @@ -17013,7 +17076,6 @@ with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`' allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`' hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' @@ -17085,7 +17147,6 @@ with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`' allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_ld_CXX='`$ECHO "$hardcode_libdir_flag_spec_ld_CXX" | $SED "$delay_single_quote_subst"`' hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`' hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`' hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`' @@ -17127,6 +17188,7 @@ DLLTOOL \ OBJDUMP \ SHELL \ ECHO \ +PATH_SEPARATOR \ SED \ GREP \ EGREP \ @@ -17175,7 +17237,6 @@ with_gnu_ld \ allow_undefined_flag \ no_undefined_flag \ hardcode_libdir_flag_spec \ -hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ exclude_expsyms \ include_expsyms \ @@ -17209,7 +17270,6 @@ with_gnu_ld_CXX \ allow_undefined_flag_CXX \ no_undefined_flag_CXX \ hardcode_libdir_flag_spec_CXX \ -hardcode_libdir_flag_spec_ld_CXX \ hardcode_libdir_separator_CXX \ exclude_expsyms_CXX \ include_expsyms_CXX \ @@ -18025,8 +18085,8 @@ $as_echo X"$file" | # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -18089,6 +18149,9 @@ SHELL=$lt_SHELL # An echo program that protects backslashes. ECHO=$lt_ECHO +# The PATH separator for the build system. +PATH_SEPARATOR=$lt_PATH_SEPARATOR + # The host system. host_alias=$host_alias host=$host @@ -18384,10 +18447,6 @@ no_undefined_flag=$lt_no_undefined_flag # This must work even if \$libdir does not exist hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec -# If ld is used when linking, flag to hardcode \$libdir into a binary -# during linking. This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld - # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator @@ -18730,10 +18789,6 @@ no_undefined_flag=$lt_no_undefined_flag_CXX # This must work even if \$libdir does not exist hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX -# If ld is used when linking, flag to hardcode \$libdir into a binary -# during linking. This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX - # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX diff --git a/configure.ac b/configure.ac index 0bf76a7..5e65125 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([libxml++], [2.35.1], +AC_INIT([libxml++], [2.35.2], [https://bugzilla.gnome.org/enter_bug.cgi?product=libxml%2B%2B], [libxml++], [http://libxmlplusplus.sourceforge.net/]) AC_PREREQ([2.59]) @@ -42,8 +42,6 @@ AC_ARG_ENABLE([examples], AM_CONDITIONAL([ENABLE_EXAMPLES], [test "x$enable_examples" = xyes]) -# Offer the ability to omit some API from the library, to reduce the code size: -LIBXMLCPP_ARG_ENABLE_API_EXCEPTIONS MM_ARG_ENABLE_DOCUMENTATION MM_ARG_WITH_TAGFILE_DOC([glibmm-2.4.tag], [glibmm-2.4]) diff --git a/docs/manual/html/ch01s02.html b/docs/manual/html/ch01s02.html index f1adf6a..7a1e95b 100644 --- a/docs/manual/html/ch01s02.html +++ b/docs/manual/html/ch01s02.html @@ -2,7 +2,7 @@ UTF-8 and Glib::ustring - + @@ -24,7 +24,7 @@

-UTF-8 and Glib::ustring

+UTF-8 and Glib::ustring

The libxml++ API takes, and gives, strings in the UTF-8 Unicode encoding, which can support all known languages and locales. This choice was made because, of the encodings that have this capability, UTF-8 is the most commonly accepted choice. UTF-8 is a multi-byte encoding, meaning that some characters use more than 1 byte. But for compatibility, old-fashioned 7-bit ASCII strings are unchanged when encoded as UTF-8, and UTF-8 strings do not contain null bytes which would cause old code to misjudge the number of bytes. For these reasons, you can store a UTF-8 string in a std::string object. However, the std::string API will operate on that string in terms of bytes, instead of characters.

Because Standard C++ has no string class that can fully handle UTF-8, libxml++ uses the Glib::ustring class from the glibmm library. Glib::ustring has almost exactly the same API as std::string, but methods such as length() and operator[] deal with whole UTF-8 characters rather than raw bytes.

There are implicit conversions between std::string and Glib::ustring, so you can use std::string wherever you see a Glib::ustring in the API, if you really don't care about any locale other than English. However, that is unlikely in today's connected world.

diff --git a/docs/manual/html/ch01s03.html b/docs/manual/html/ch01s03.html index 1f35149..a94c547 100644 --- a/docs/manual/html/ch01s03.html +++ b/docs/manual/html/ch01s03.html @@ -2,7 +2,7 @@ Compilation and Linking - + @@ -24,7 +24,7 @@

-Compilation and Linking

+Compilation and Linking

To use libxml++ in your application, you must tell the compiler where to find the include headers and where to find the libxml++ library. libxml++ provides a pkg-config .pc file to make this easy. For instance, the following command will provide the necessary compiler options: pkg-config libxml++-2.6 --cflags --libs

diff --git a/docs/manual/html/ch02s02.html b/docs/manual/html/ch02s02.html index 86d85da..6886247 100644 --- a/docs/manual/html/ch02s02.html +++ b/docs/manual/html/ch02s02.html @@ -2,7 +2,7 @@ SAX Parser - + @@ -24,13 +24,13 @@

-SAX Parser

+SAX Parser

The SAX parser presents each node of the XML document in sequence. So when you process one node, you must have already stored information about any relevant previous nodes, and you have no information at that time about subsequent nodes. The SAX parser uses less memory than the DOM parser and it is a suitable abstraction for documents that can be processed sequentially rather than as a whole.

By using the parse_chunk() method instead of parse(), you can even parse parts of the XML document before you have received the whole document.

As shown in the example, you should derive your own class from SaxParser and override some of the virtual methods. These "handler" methods will be called while the document is parsed.

-Example

+Example

This example shows how the handler methods are called during parsing.

Source Code

File: myparser.h @@ -49,7 +49,6 @@ public: protected: //overrides: -#ifdef LIBXMLCPP_EXCEPTIONS_ENABLED virtual void on_start_document(); virtual void on_end_document(); virtual void on_start_element(const Glib::ustring& name, @@ -60,7 +59,6 @@ protected: virtual void on_warning(const Glib::ustring& text); virtual void on_error(const Glib::ustring& text); virtual void on_fatal_error(const Glib::ustring& text); -#endif }; @@ -85,7 +83,6 @@ MySaxParser::~MySaxParser() { } -#ifdef LIBXMLCPP_EXCEPTIONS_ENABLED void MySaxParser::on_start_document() { std::cout << "on_start_document()" << std::endl; @@ -188,7 +185,7 @@ void MySaxParser::on_fatal_error(const Glib::ustring& text) std::cerr << "MySaxParser::on_characters(): Exception caught while converting value for std::cout: " << ex.what() << std::endl; } } -#endif +

@@ -218,20 +215,16 @@ main(int argc, char* argv[]) filepath = "example.xml"; // Parse the entire document in one go: - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED try { - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED MySaxParser parser; parser.set_substitute_entities(true); // parser.parse_file(filepath); - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED } catch(const xmlpp::exception& ex) { std::cout << "libxml++ exception: " << ex.what() << std::endl; } - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED // Demonstrate incremental parsing, sometimes useful for network connections: diff --git a/docs/manual/html/ch02s03.html b/docs/manual/html/ch02s03.html index 82b7f9b..4f71ee8 100644 --- a/docs/manual/html/ch02s03.html +++ b/docs/manual/html/ch02s03.html @@ -2,7 +2,7 @@ TextReader Parser - + @@ -22,12 +22,12 @@

-TextReader Parser

+TextReader Parser

Like the SAX parser, the TextReader parser is suitable for sequential parsing, but instead of implementing handlers for specific parts of the document, it allows you to detect the current node type, process the node accordingly, and skip forward in the document as much as necessary. Unlike the DOM parser, you may not move backwards in the XML document. And unlike the SAX parser, you must not waste time processing nodes that do not interest you.

All methods are on the single parser instance, but their result depends on the current context. For instance, use read() to move to the next node, and move_to_element() to navigate to child nodes. These methods will return false when no more nodes are available. Then use methods such as get_name() and get_value() to examine the elements and their attributes.

-Example

+Example

This example examines each node in turn, then moves to the next node.

Source Code

File: main.cc @@ -62,10 +62,8 @@ int main(int /* argc */, char** /* argv */) // so we can use std::cout with UTF-8, via Glib::ustring, without exceptions. std::locale::global(std::locale("")); - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED try { - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED xmlpp::TextReader reader("example.xml"); while(reader.read()) @@ -96,13 +94,11 @@ int main(int /* argc */, char** /* argv */) std::cout << indent(depth) << "novalue" << std::endl; } - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED } catch(const std::exception& e) { std::cout << "Exception caught: " << e.what() << std::endl; } - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } diff --git a/docs/manual/html/chapter-introduction.html b/docs/manual/html/chapter-introduction.html index b1f2116..bbd394d 100644 --- a/docs/manual/html/chapter-introduction.html +++ b/docs/manual/html/chapter-introduction.html @@ -2,7 +2,7 @@ Chapter 1. libxml++ - + @@ -28,7 +28,7 @@

Table of Contents

@@ -42,7 +42,7 @@

But libxml++ was created mainly to fill the need for an API-stable and ABI-stable C++ XML parser which could be used as a shared library dependency by C++ applications that are distributed widely in binary form. That means that installed applications will not break when new versions of libxml++ are installed on a user's computer. Gradual improvement of the libxml++ API is still possible via non-breaking API additions, and new independent versions of the ABI that can be installed in parallel with older versions. These are the general techniques and principles followed by the GNOME project, of which libxml++ is a part.

-Installation

+Installation

libxml++ is packaged by major Linux and *BSD distributions and can be installed from source on Linux and Windows, using any modern compiler, such as g++, SUN Forte, or MSVC++.

For instance, to install libxml++ and its documentation on debian, use apt-get or synaptic like so:

diff --git a/docs/manual/html/chapter-parsers.html b/docs/manual/html/chapter-parsers.html index 4a132cd..22915ab 100644 --- a/docs/manual/html/chapter-parsers.html +++ b/docs/manual/html/chapter-parsers.html @@ -2,7 +2,7 @@ Chapter 2. Parsers - + @@ -28,7 +28,7 @@

Table of Contents

@@ -38,7 +38,7 @@

Remember that white space is usually significant in XML documents, so the parsers might provide unexpected text nodes that contain only spaces and new lines. The parser does not know whether you care about these text nodes, but your application may choose to ignore them.

-DOM Parser

+DOM Parser

The DOM parser parses the whole document at once and stores the structure in memory, available via Parser::get_document(). With methods such as Document::get_root_node() and Node::get_children(), you may then navigate into the heirarchy of XML nodes without restriction, jumping forwards or backwards in the document based on the information that you encounter. Therefore the DOM parser uses a relatively large amount of memory.

You should use C++ RTTI (via dynamic_cast<>) to identify the specific node type and to perform actions which are not possible with all node types. For instance, only Elements have attributes. Here is the inheritance hierarchy of node types:

@@ -82,7 +82,7 @@

There are also several methods which can create new child Nodes. By using these, and one of the Document::write_*() methods, you can use libxml++ to build a new XML document.

-Example

+Example

This example looks in the document for expected elements and then examines them. All these examples are included in the libxml++ source distribution.

Source Code

File: main.cc @@ -221,10 +221,8 @@ int main(int argc, char* argv[]) else filepath = "example.xml"; - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED try { - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED xmlpp::DomParser parser; if (validate) parser.set_validate(); @@ -239,13 +237,11 @@ int main(int argc, char* argv[]) const xmlpp::Node* pNode = parser.get_document()->get_root_node(); //deleted by DomParser. print_node(pNode); } - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED } catch(const std::exception& ex) { std::cout << "Exception caught: " << ex.what() << std::endl; } - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED return 0; } diff --git a/docs/manual/html/index.html b/docs/manual/html/index.html index eb7382b..5f97372 100644 --- a/docs/manual/html/index.html +++ b/docs/manual/html/index.html @@ -2,7 +2,7 @@ libxml++ - An XML Parser for C++ - + @@ -43,14 +43,14 @@

  • 1. libxml++
  • 2. Parsers diff --git a/docs/manual/libxml++.xml b/docs/manual/libxml++.xml index 4852dd5..89de96e 100644 --- a/docs/manual/libxml++.xml +++ b/docs/manual/libxml++.xml @@ -253,10 +253,8 @@ int main(int argc, char* argv[]) else filepath = "example.xml"; - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED try { - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED xmlpp::DomParser parser; if (validate) parser.set_validate(); @@ -271,13 +269,11 @@ int main(int argc, char* argv[]) const xmlpp::Node* pNode = parser.get_document()->get_root_node(); //deleted by DomParser. print_node(pNode); } - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED } catch(const std::exception& ex) { std::cout << "Exception caught: " << ex.what() << std::endl; } - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED return 0; } @@ -319,7 +315,6 @@ public: protected: //overrides: -#ifdef LIBXMLCPP_EXCEPTIONS_ENABLED virtual void on_start_document(); virtual void on_end_document(); virtual void on_start_element(const Glib::ustring& name, @@ -330,7 +325,6 @@ protected: virtual void on_warning(const Glib::ustring& text); virtual void on_error(const Glib::ustring& text); virtual void on_fatal_error(const Glib::ustring& text); -#endif }; @@ -353,7 +347,6 @@ MySaxParser::~MySaxParser() { } -#ifdef LIBXMLCPP_EXCEPTIONS_ENABLED void MySaxParser::on_start_document() { std::cout << "on_start_document()" << std::endl; @@ -456,7 +449,7 @@ void MySaxParser::on_fatal_error(const Glib::ustring& text) std::cerr << "MySaxParser::on_characters(): Exception caught while converting value for std::cout: " << ex.what() << std::endl; } } -#endif + File: main.cc @@ -484,20 +477,16 @@ main(int argc, char* argv[]) filepath = "example.xml"; // Parse the entire document in one go: - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED try { - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED MySaxParser parser; parser.set_substitute_entities(true); // parser.parse_file(filepath); - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED } catch(const xmlpp::exception& ex) { std::cout << "libxml++ exception: " << ex.what() << std::endl; } - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED // Demonstrate incremental parsing, sometimes useful for network connections: @@ -582,10 +571,8 @@ int main(int /* argc */, char** /* argv */) // so we can use std::cout with UTF-8, via Glib::ustring, without exceptions. std::locale::global(std::locale("")); - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED try { - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED xmlpp::TextReader reader("example.xml"); while(reader.read()) @@ -616,13 +603,11 @@ int main(int /* argc */, char** /* argv */) std::cout << indent(depth) << "novalue" << std::endl; } - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED } catch(const std::exception& e) { std::cout << "Exception caught: " << e.what() << std::endl; } - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } diff --git a/docs/reference/html/annotated.html b/docs/reference/html/annotated.html index 0f94a0b..c6e09d6 100644 --- a/docs/reference/html/annotated.html +++ b/docs/reference/html/annotated.html @@ -2,24 +2,40 @@ + libxml++: Class List + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    Here are the classes, structs, unions and interfaces with brief descriptions:
    @@ -80,9 +96,14 @@
    trackable
    xmlpp::ValidatorXML parser
    xmlpp::validity_errorThis exception will be thrown when the parser encounters a validity error in the XML document
    -
    - +
    + + + + diff --git a/docs/reference/html/classes.html b/docs/reference/html/classes.html index 8fcdf7d..61f6939 100644 --- a/docs/reference/html/classes.html +++ b/docs/reference/html/classes.html @@ -2,24 +2,40 @@ + libxml++: Class Index + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    A | C | D | E | I | K | N | O | P | S | T | V
    - -
      A  
    -
      D  
    -
    std::exception   OStreamOutputBuffer (xmlpp)   Schema (xmlpp)   
    SaxParser::Attribute (xmlpp)   Document (xmlpp)   
      I  
    -
    OutputBuffer (xmlpp)   SchemaValidator (xmlpp)   
    Attribute (xmlpp)   DomParser (xmlpp)   internal_error (xmlpp)   
      P  
    -
      T  
    -
    AttributeDeclaration (xmlpp)   Dtd (xmlpp)   IStreamParserInputBuffer (xmlpp)   parse_error (xmlpp)   TextNode (xmlpp)   
    SaxParser::AttributeHasName (xmlpp)   DtdValidator (xmlpp)   
      K  
    -
    Parser (xmlpp)   TextReader (xmlpp)   
    AttributeNode (xmlpp)   
      E  
    -
    KeepBlanks (xmlpp)   ParserInputBuffer (xmlpp)   sigc::trackable   
      C  
    -
    Element (xmlpp)   
      N  
    -
    ProcessingInstructionNode (xmlpp)   
      V  
    -
    CdataNode (xmlpp)   EntityDeclaration (xmlpp)   Node (xmlpp)   
      S  
    -
    Validator (xmlpp)   
    CommentNode (xmlpp)   EntityReference (xmlpp)   NonCopyable (xmlpp)   SaxParser (xmlpp)   validity_error (xmlpp)   
    ContentNode (xmlpp)   exception (xmlpp)   
      O  
    -
    A | C | D | E | I | K | N | O | P | S | T | V
    -
    - + + + + + + + + + + + + + + + +
      A  
    +
      D  
    +
    std::exception   
      O  
    +
    Schema (xmlpp)   
      I  
    +
    SchemaValidator (xmlpp)   
    SaxParser::Attribute (xmlpp)   Document (xmlpp)   OStreamOutputBuffer (xmlpp)   
      T  
    +
    Attribute (xmlpp)   DomParser (xmlpp)   internal_error (xmlpp)   OutputBuffer (xmlpp)   
    AttributeDeclaration (xmlpp)   Dtd (xmlpp)   IStreamParserInputBuffer (xmlpp)   
      P  
    +
    TextNode (xmlpp)   
    SaxParser::AttributeHasName (xmlpp)   DtdValidator (xmlpp)   
      K  
    +
    TextReader (xmlpp)   
    AttributeNode (xmlpp)   
      E  
    +
    parse_error (xmlpp)   sigc::trackable   
      C  
    +
    KeepBlanks (xmlpp)   Parser (xmlpp)   
      V  
    +
    Element (xmlpp)   
      N  
    +
    ParserInputBuffer (xmlpp)   
    CdataNode (xmlpp)   EntityDeclaration (xmlpp)   ProcessingInstructionNode (xmlpp)   Validator (xmlpp)   
    CommentNode (xmlpp)   EntityReference (xmlpp)   Node (xmlpp)   
      S  
    +
    validity_error (xmlpp)   
    ContentNode (xmlpp)   exception (xmlpp)   NonCopyable (xmlpp)   
    SaxParser (xmlpp)   
    +
    A | C | D | E | I | K | N | O | P | S | T | V
    +
    + + + + diff --git a/docs/reference/html/classsigc_1_1trackable.html b/docs/reference/html/classsigc_1_1trackable.html index d1ec85c..ff8de55 100644 --- a/docs/reference/html/classsigc_1_1trackable.html +++ b/docs/reference/html/classsigc_1_1trackable.html @@ -2,24 +2,40 @@ + libxml++: trackable Class Reference + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    Inheritance diagram for trackable:
    Inheritance graph
    - +
    [legend]
    - -
    -
    The documentation for this class was generated from the following file:
    - +
    The documentation for this class was generated from the following file:
    + + + + diff --git a/docs/reference/html/classsigc_1_1trackable__inherit__graph.png b/docs/reference/html/classsigc_1_1trackable__inherit__graph.png index 190b2b9..b6d815c 100644 Binary files a/docs/reference/html/classsigc_1_1trackable__inherit__graph.png and b/docs/reference/html/classsigc_1_1trackable__inherit__graph.png differ diff --git a/docs/reference/html/classstd_1_1exception.html b/docs/reference/html/classstd_1_1exception.html index f6ef59a..39dd551 100644 --- a/docs/reference/html/classstd_1_1exception.html +++ b/docs/reference/html/classstd_1_1exception.html @@ -2,24 +2,40 @@ + libxml++: exception Class Reference + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    Inheritance diagram for exception:
    Inheritance graph
    - +
    [legend]
    - -

    The documentation for this class was generated from the following file:
    • exceptions/exception.h
    -
    - +
    + + + + diff --git a/docs/reference/html/classstd_1_1exception__inherit__graph.png b/docs/reference/html/classstd_1_1exception__inherit__graph.png index 119e063..4a450c9 100644 Binary files a/docs/reference/html/classstd_1_1exception__inherit__graph.png and b/docs/reference/html/classstd_1_1exception__inherit__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1Attribute-members.html b/docs/reference/html/classxmlpp_1_1Attribute-members.html index 90bb979..5de1fe7 100644 --- a/docs/reference/html/classxmlpp_1_1Attribute-members.html +++ b/docs/reference/html/classxmlpp_1_1Attribute-members.html @@ -2,24 +2,40 @@ + libxml++: Member List + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    This is the complete list of members for xmlpp::Attribute, including all inherited members. @@ -62,6 +78,8 @@ This is the complete list of members for + + @@ -86,9 +104,14 @@ This is the complete list of members for -
    add_child(const Glib::ustring& name, const Glib::ustring& ns_prefix=Glib::ustring())xmlpp::Node
    free_wrappers(_xmlNode* attr)xmlpp::Node [static]
    get_children(const Glib::ustring& name=Glib::ustring())xmlpp::Node
    get_children(const Glib::ustring& name=Glib::ustring()) const xmlpp::Node
    get_first_child(const Glib::ustring& name=Glib::ustring()) const xmlpp::Node
    get_first_child(const Glib::ustring& name=Glib::ustring())xmlpp::Node
    get_line() const xmlpp::Node
    get_name() const xmlpp::Attribute
    get_namespace_prefix() const xmlpp::Node
    ~Attribute()xmlpp::Attribute [virtual]
    ~Node()xmlpp::Node [virtual]
    ~NonCopyable()xmlpp::NonCopyable [protected, virtual]
    - +
    + + + + diff --git a/docs/reference/html/classxmlpp_1_1Attribute.html b/docs/reference/html/classxmlpp_1_1Attribute.html index cfef8f3..b607b51 100644 --- a/docs/reference/html/classxmlpp_1_1Attribute.html +++ b/docs/reference/html/classxmlpp_1_1Attribute.html @@ -2,24 +2,40 @@ + libxml++: xmlpp::Attribute Class Reference + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    xmlpp::Attribute Class Reference
    -
    +

    Represents an XML Node attribute. More...

    @@ -59,14 +75,14 @@ Inheritance diagram for xmlpp::Attribute:
    Inheritance graph
    - +
    [legend]
    Collaboration diagram for xmlpp::Attribute:
    Collaboration graph
    - +
    [legend]

    List of all members.

    @@ -95,7 +111,7 @@ Public Member Functions
    - + @@ -112,7 +128,7 @@ Public Member Functions
    xmlpp::Attribute::Attribute xmlpp::Attribute::Attribute ( _xmlNode *  node)
    - + @@ -129,7 +145,7 @@ Public Member Functions
    virtual xmlpp::Attribute::~Attribute virtual xmlpp::Attribute::~Attribute ( ) [virtual]
    - + @@ -152,7 +168,7 @@ Public Member Functions
    _xmlAttr* xmlpp::Attribute::cobj _xmlAttr* xmlpp::Attribute::cobj ( )
    - + @@ -175,7 +191,7 @@ Public Member Functions
    const _xmlAttr* xmlpp::Attribute::cobj const _xmlAttr* xmlpp::Attribute::cobj ( ) const
    - + @@ -197,7 +213,7 @@ Public Member Functions
    Glib::ustring xmlpp::Attribute::get_name Glib::ustring xmlpp::Attribute::get_name ( ) const
    - + @@ -219,7 +235,7 @@ Public Member Functions
    Glib::ustring xmlpp::Attribute::get_value Glib::ustring xmlpp::Attribute::get_value ( ) const
    - + @@ -237,9 +253,14 @@ Public Member Functions
    The documentation for this class was generated from the following file:
    • attribute.h
    - - + + + + + diff --git a/docs/reference/html/classxmlpp_1_1AttributeDeclaration-members.html b/docs/reference/html/classxmlpp_1_1AttributeDeclaration-members.html index 6eba716..2710bd9 100644 --- a/docs/reference/html/classxmlpp_1_1AttributeDeclaration-members.html +++ b/docs/reference/html/classxmlpp_1_1AttributeDeclaration-members.html @@ -2,24 +2,40 @@ +libxml++: Member List + - + + + + - -
    +
    + +
    void xmlpp::Attribute::set_value void xmlpp::Attribute::set_value ( const Glib::ustring value)
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    This is the complete list of members for xmlpp::AttributeDeclaration, including all inherited members. @@ -63,6 +79,8 @@ This is the complete list of members for + + @@ -88,9 +106,14 @@ This is the complete list of members for -
    add_child(const Glib::ustring& name, const Glib::ustring& ns_prefix=Glib::ustring())xmlpp::Node
    free_wrappers(_xmlNode* attr)xmlpp::Node [static]
    get_children(const Glib::ustring& name=Glib::ustring())xmlpp::Node
    get_children(const Glib::ustring& name=Glib::ustring()) const xmlpp::Node
    get_first_child(const Glib::ustring& name=Glib::ustring()) const xmlpp::Node
    get_first_child(const Glib::ustring& name=Glib::ustring())xmlpp::Node
    get_line() const xmlpp::Node
    get_name() const xmlpp::Attribute
    get_namespace_prefix() const xmlpp::Node
    ~AttributeDeclaration()xmlpp::AttributeDeclaration [virtual]
    ~Node()xmlpp::Node [virtual]
    ~NonCopyable()xmlpp::NonCopyable [protected, virtual]
    - +
    + + + + diff --git a/docs/reference/html/classxmlpp_1_1AttributeDeclaration.html b/docs/reference/html/classxmlpp_1_1AttributeDeclaration.html index 7aad9ad..a642f5a 100644 --- a/docs/reference/html/classxmlpp_1_1AttributeDeclaration.html +++ b/docs/reference/html/classxmlpp_1_1AttributeDeclaration.html @@ -2,24 +2,40 @@ + libxml++: xmlpp::AttributeDeclaration Class Reference + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    xmlpp::AttributeDeclaration Class Reference
    -
    +

    Represents the default value of an attribute of an XML Element node. More...

    @@ -59,14 +75,14 @@ Inheritance diagram for xmlpp::AttributeDeclaration:
    Inheritance graph
    - +
    [legend]
    Collaboration diagram for xmlpp::AttributeDeclaration:
    Collaboration graph
    - +
    [legend]

    List of all members.

    @@ -92,7 +108,7 @@ Public Member Functions
    - + @@ -109,7 +125,7 @@ Public Member Functions
    xmlpp::AttributeDeclaration::AttributeDeclaration xmlpp::AttributeDeclaration::AttributeDeclaration ( _xmlNode *  node)
    - + @@ -126,7 +142,7 @@ Public Member Functions
    virtual xmlpp::AttributeDeclaration::~AttributeDeclaration virtual xmlpp::AttributeDeclaration::~AttributeDeclaration ( ) [virtual]
    - + @@ -146,7 +162,7 @@ Public Member Functions
    _xmlAttribute* xmlpp::AttributeDeclaration::cobj _xmlAttribute* xmlpp::AttributeDeclaration::cobj ( )
    - + @@ -166,7 +182,7 @@ Public Member Functions
    const _xmlAttribute* xmlpp::AttributeDeclaration::cobj const _xmlAttribute* xmlpp::AttributeDeclaration::cobj ( ) const
    - + @@ -185,9 +201,14 @@ Public Member Functions
    The documentation for this class was generated from the following file:
    • attributedeclaration.h
    - - + + + + + diff --git a/docs/reference/html/classxmlpp_1_1AttributeDeclaration__coll__graph.png b/docs/reference/html/classxmlpp_1_1AttributeDeclaration__coll__graph.png index 44fe580..743ad24 100644 Binary files a/docs/reference/html/classxmlpp_1_1AttributeDeclaration__coll__graph.png and b/docs/reference/html/classxmlpp_1_1AttributeDeclaration__coll__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1AttributeDeclaration__inherit__graph.png b/docs/reference/html/classxmlpp_1_1AttributeDeclaration__inherit__graph.png index 44fe580..743ad24 100644 Binary files a/docs/reference/html/classxmlpp_1_1AttributeDeclaration__inherit__graph.png and b/docs/reference/html/classxmlpp_1_1AttributeDeclaration__inherit__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1AttributeNode-members.html b/docs/reference/html/classxmlpp_1_1AttributeNode-members.html index ed95949..6fe55f5 100644 --- a/docs/reference/html/classxmlpp_1_1AttributeNode-members.html +++ b/docs/reference/html/classxmlpp_1_1AttributeNode-members.html @@ -2,24 +2,40 @@ +libxml++: Member List + - + + + + - -
    +
    + +
    Glib::ustring xmlpp::AttributeDeclaration::get_value Glib::ustring xmlpp::AttributeDeclaration::get_value ( ) const
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    This is the complete list of members for xmlpp::AttributeNode, including all inherited members. @@ -63,6 +79,8 @@ This is the complete list of members for + + @@ -88,9 +106,14 @@ This is the complete list of members for -
    add_child(const Glib::ustring& name, const Glib::ustring& ns_prefix=Glib::ustring())xmlpp::Node
    free_wrappers(_xmlNode* attr)xmlpp::Node [static]
    get_children(const Glib::ustring& name=Glib::ustring())xmlpp::Node
    get_children(const Glib::ustring& name=Glib::ustring()) const xmlpp::Node
    get_first_child(const Glib::ustring& name=Glib::ustring()) const xmlpp::Node
    get_first_child(const Glib::ustring& name=Glib::ustring())xmlpp::Node
    get_line() const xmlpp::Node
    get_name() const xmlpp::Attribute
    get_namespace_prefix() const xmlpp::Node
    ~AttributeNode()xmlpp::AttributeNode [virtual]
    ~Node()xmlpp::Node [virtual]
    ~NonCopyable()xmlpp::NonCopyable [protected, virtual]
    - +
    + + + + diff --git a/docs/reference/html/classxmlpp_1_1AttributeNode.html b/docs/reference/html/classxmlpp_1_1AttributeNode.html index d3a3f5e..6ecc995 100644 --- a/docs/reference/html/classxmlpp_1_1AttributeNode.html +++ b/docs/reference/html/classxmlpp_1_1AttributeNode.html @@ -2,24 +2,40 @@ + libxml++: xmlpp::AttributeNode Class Reference + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    xmlpp::AttributeNode Class Reference
    -
    +

    Represents an explicit attribute of an XML Element node. More...

    @@ -59,14 +75,14 @@ Inheritance diagram for xmlpp::AttributeNode:
    Inheritance graph
    - +
    [legend]
    Collaboration diagram for xmlpp::AttributeNode:
    Collaboration graph
    - +
    [legend]

    List of all members.

    @@ -86,7 +102,7 @@ Public Member Functions
    - + @@ -103,7 +119,7 @@ Public Member Functions
    xmlpp::AttributeNode::AttributeNode xmlpp::AttributeNode::AttributeNode ( _xmlNode *  node)
    - + @@ -117,9 +133,14 @@ Public Member Functions
    The documentation for this class was generated from the following file:
    • attributenode.h
    - - + + + + + diff --git a/docs/reference/html/classxmlpp_1_1AttributeNode__coll__graph.png b/docs/reference/html/classxmlpp_1_1AttributeNode__coll__graph.png index 262bc07..5a85241 100644 Binary files a/docs/reference/html/classxmlpp_1_1AttributeNode__coll__graph.png and b/docs/reference/html/classxmlpp_1_1AttributeNode__coll__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1AttributeNode__inherit__graph.png b/docs/reference/html/classxmlpp_1_1AttributeNode__inherit__graph.png index 262bc07..5a85241 100644 Binary files a/docs/reference/html/classxmlpp_1_1AttributeNode__inherit__graph.png and b/docs/reference/html/classxmlpp_1_1AttributeNode__inherit__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1Attribute__coll__graph.png b/docs/reference/html/classxmlpp_1_1Attribute__coll__graph.png index 047b45c..38e49ce 100644 Binary files a/docs/reference/html/classxmlpp_1_1Attribute__coll__graph.png and b/docs/reference/html/classxmlpp_1_1Attribute__coll__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1Attribute__inherit__graph.png b/docs/reference/html/classxmlpp_1_1Attribute__inherit__graph.png index bfece29..f660c92 100644 Binary files a/docs/reference/html/classxmlpp_1_1Attribute__inherit__graph.png and b/docs/reference/html/classxmlpp_1_1Attribute__inherit__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1CdataNode-members.html b/docs/reference/html/classxmlpp_1_1CdataNode-members.html index eac86e9..4776f4e 100644 --- a/docs/reference/html/classxmlpp_1_1CdataNode-members.html +++ b/docs/reference/html/classxmlpp_1_1CdataNode-members.html @@ -2,24 +2,40 @@ +libxml++: Member List + - + + + + - -
    +
    + +
    virtual xmlpp::AttributeNode::~AttributeNode virtual xmlpp::AttributeNode::~AttributeNode ( ) [virtual]
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    This is the complete list of members for xmlpp::CdataNode, including all inherited members. @@ -64,6 +80,8 @@ This is the complete list of members for + + @@ -89,9 +107,14 @@ This is the complete list of members for -
    add_child(const Glib::ustring& name, const Glib::ustring& ns_prefix=Glib::ustring())xmlpp::Node
    get_children(const Glib::ustring& name=Glib::ustring())xmlpp::Node
    get_children(const Glib::ustring& name=Glib::ustring()) const xmlpp::Node
    get_content() const xmlpp::ContentNode
    get_first_child(const Glib::ustring& name=Glib::ustring()) const xmlpp::Node
    get_first_child(const Glib::ustring& name=Glib::ustring())xmlpp::Node
    get_line() const xmlpp::Node
    get_name() const xmlpp::Node
    get_namespace_prefix() const xmlpp::Node
    ~ContentNode()xmlpp::ContentNode [virtual]
    ~Node()xmlpp::Node [virtual]
    ~NonCopyable()xmlpp::NonCopyable [protected, virtual]
    - +
    + + + + diff --git a/docs/reference/html/classxmlpp_1_1CdataNode.html b/docs/reference/html/classxmlpp_1_1CdataNode.html index 11444ac..9d3e761 100644 --- a/docs/reference/html/classxmlpp_1_1CdataNode.html +++ b/docs/reference/html/classxmlpp_1_1CdataNode.html @@ -2,24 +2,40 @@ + libxml++: xmlpp::CdataNode Class Reference + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    xmlpp::CdataNode Class Reference
    -
    +

    CData node. More...

    @@ -59,14 +75,14 @@ Inheritance diagram for xmlpp::CdataNode:
    Inheritance graph
    - +
    [legend]
    Collaboration diagram for xmlpp::CdataNode:
    Collaboration graph
    - +
    [legend]

    List of all members.

    @@ -85,7 +101,7 @@ Public Member Functions
    - + @@ -102,7 +118,7 @@ Public Member Functions
    xmlpp::CdataNode::CdataNode xmlpp::CdataNode::CdataNode ( _xmlNode *  node)
    - + @@ -116,9 +132,14 @@ Public Member Functions
    The documentation for this class was generated from the following file:
    • nodes/cdatanode.h
    - - + + + + + diff --git a/docs/reference/html/classxmlpp_1_1CdataNode__coll__graph.png b/docs/reference/html/classxmlpp_1_1CdataNode__coll__graph.png index 9a5feed..587ce79 100644 Binary files a/docs/reference/html/classxmlpp_1_1CdataNode__coll__graph.png and b/docs/reference/html/classxmlpp_1_1CdataNode__coll__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1CdataNode__inherit__graph.png b/docs/reference/html/classxmlpp_1_1CdataNode__inherit__graph.png index 9a5feed..587ce79 100644 Binary files a/docs/reference/html/classxmlpp_1_1CdataNode__inherit__graph.png and b/docs/reference/html/classxmlpp_1_1CdataNode__inherit__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1CommentNode-members.html b/docs/reference/html/classxmlpp_1_1CommentNode-members.html index b19704c..dc00489 100644 --- a/docs/reference/html/classxmlpp_1_1CommentNode-members.html +++ b/docs/reference/html/classxmlpp_1_1CommentNode-members.html @@ -2,24 +2,40 @@ +libxml++: Member List + - + + + + - -
    +
    + +
    virtual xmlpp::CdataNode::~CdataNode virtual xmlpp::CdataNode::~CdataNode ( ) [virtual]
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    This is the complete list of members for xmlpp::CommentNode, including all inherited members. @@ -64,6 +80,8 @@ This is the complete list of members for + + @@ -89,9 +107,14 @@ This is the complete list of members for -
    add_child(const Glib::ustring& name, const Glib::ustring& ns_prefix=Glib::ustring())xmlpp::Node
    get_children(const Glib::ustring& name=Glib::ustring())xmlpp::Node
    get_children(const Glib::ustring& name=Glib::ustring()) const xmlpp::Node
    get_content() const xmlpp::ContentNode
    get_first_child(const Glib::ustring& name=Glib::ustring()) const xmlpp::Node
    get_first_child(const Glib::ustring& name=Glib::ustring())xmlpp::Node
    get_line() const xmlpp::Node
    get_name() const xmlpp::Node
    get_namespace_prefix() const xmlpp::Node
    ~ContentNode()xmlpp::ContentNode [virtual]
    ~Node()xmlpp::Node [virtual]
    ~NonCopyable()xmlpp::NonCopyable [protected, virtual]
    - +
    + + + + diff --git a/docs/reference/html/classxmlpp_1_1CommentNode.html b/docs/reference/html/classxmlpp_1_1CommentNode.html index c406987..378f227 100644 --- a/docs/reference/html/classxmlpp_1_1CommentNode.html +++ b/docs/reference/html/classxmlpp_1_1CommentNode.html @@ -2,24 +2,40 @@ + libxml++: xmlpp::CommentNode Class Reference + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    xmlpp::CommentNode Class Reference
    -
    +

    Comment Node. More...

    @@ -59,14 +75,14 @@ Inheritance diagram for xmlpp::CommentNode:
    Inheritance graph
    - +
    [legend]
    Collaboration diagram for xmlpp::CommentNode:
    Collaboration graph
    - +
    [legend]

    List of all members.

    @@ -85,7 +101,7 @@ Public Member Functions
    - + @@ -102,7 +118,7 @@ Public Member Functions
    xmlpp::CommentNode::CommentNode xmlpp::CommentNode::CommentNode ( _xmlNode *  node)
    - + @@ -116,9 +132,14 @@ Public Member Functions
    The documentation for this class was generated from the following file:
    • nodes/commentnode.h
    - - + + + + + diff --git a/docs/reference/html/classxmlpp_1_1CommentNode__coll__graph.png b/docs/reference/html/classxmlpp_1_1CommentNode__coll__graph.png index b1d12a6..768327c 100644 Binary files a/docs/reference/html/classxmlpp_1_1CommentNode__coll__graph.png and b/docs/reference/html/classxmlpp_1_1CommentNode__coll__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1CommentNode__inherit__graph.png b/docs/reference/html/classxmlpp_1_1CommentNode__inherit__graph.png index b1d12a6..768327c 100644 Binary files a/docs/reference/html/classxmlpp_1_1CommentNode__inherit__graph.png and b/docs/reference/html/classxmlpp_1_1CommentNode__inherit__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1ContentNode-members.html b/docs/reference/html/classxmlpp_1_1ContentNode-members.html index c1fe89d..1b5e5fb 100644 --- a/docs/reference/html/classxmlpp_1_1ContentNode-members.html +++ b/docs/reference/html/classxmlpp_1_1ContentNode-members.html @@ -2,24 +2,40 @@ +libxml++: Member List + - + + + + - -
    +
    + +
    virtual xmlpp::CommentNode::~CommentNode virtual xmlpp::CommentNode::~CommentNode ( ) [virtual]
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    This is the complete list of members for xmlpp::ContentNode, including all inherited members. @@ -63,6 +79,8 @@ This is the complete list of members for + + @@ -87,9 +105,14 @@ This is the complete list of members for -
    add_child(const Glib::ustring& name, const Glib::ustring& ns_prefix=Glib::ustring())xmlpp::Node
    get_children(const Glib::ustring& name=Glib::ustring())xmlpp::Node
    get_children(const Glib::ustring& name=Glib::ustring()) const xmlpp::Node
    get_content() const xmlpp::ContentNode
    get_first_child(const Glib::ustring& name=Glib::ustring()) const xmlpp::Node
    get_first_child(const Glib::ustring& name=Glib::ustring())xmlpp::Node
    get_line() const xmlpp::Node
    get_name() const xmlpp::Node
    get_namespace_prefix() const xmlpp::Node
    ~ContentNode()xmlpp::ContentNode [virtual]
    ~Node()xmlpp::Node [virtual]
    ~NonCopyable()xmlpp::NonCopyable [protected, virtual]
    - +
    + + + + diff --git a/docs/reference/html/classxmlpp_1_1ContentNode.html b/docs/reference/html/classxmlpp_1_1ContentNode.html index 2e3522f..c44d748 100644 --- a/docs/reference/html/classxmlpp_1_1ContentNode.html +++ b/docs/reference/html/classxmlpp_1_1ContentNode.html @@ -2,24 +2,40 @@ + libxml++: xmlpp::ContentNode Class Reference + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    xmlpp::ContentNode Class Reference
    -
    +

    Content Node. More...

    @@ -59,14 +75,14 @@ Inheritance diagram for xmlpp::ContentNode:
    Inheritance graph
    - +
    [legend]
    Collaboration diagram for xmlpp::ContentNode:
    Collaboration graph
    - +
    [legend]

    List of all members.

    @@ -90,7 +106,7 @@ Public Member Functions
    - + @@ -107,7 +123,7 @@ Public Member Functions
    xmlpp::ContentNode::ContentNode xmlpp::ContentNode::ContentNode ( _xmlNode *  node)
    - + @@ -124,7 +140,7 @@ Public Member Functions
    virtual xmlpp::ContentNode::~ContentNode virtual xmlpp::ContentNode::~ContentNode ( ) [virtual]
    - + @@ -143,7 +159,7 @@ Public Member Functions
    Glib::ustring xmlpp::ContentNode::get_content Glib::ustring xmlpp::ContentNode::get_content ( ) const
    - + @@ -160,7 +176,7 @@ Public Member Functions
    bool xmlpp::ContentNode::is_white_space bool xmlpp::ContentNode::is_white_space ( ) const
    - + @@ -171,7 +187,7 @@ Public Member Functions

    Set the text of this content node.

    -
    Parameters:
    +
    Parameters:
    void xmlpp::ContentNode::set_content void xmlpp::ContentNode::set_content ( const Glib::ustring content)
    contentThe text. This must be unescaped, meaning that the predefined entities will be created for you where necessary. See get_content().
    @@ -183,9 +199,14 @@ Public Member Functions
    The documentation for this class was generated from the following file:
    • nodes/contentnode.h
    -
    - + + + + + diff --git a/docs/reference/html/classxmlpp_1_1ContentNode__coll__graph.png b/docs/reference/html/classxmlpp_1_1ContentNode__coll__graph.png index fe7a331..d3aac23 100644 Binary files a/docs/reference/html/classxmlpp_1_1ContentNode__coll__graph.png and b/docs/reference/html/classxmlpp_1_1ContentNode__coll__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1ContentNode__inherit__graph.png b/docs/reference/html/classxmlpp_1_1ContentNode__inherit__graph.png index 5929737..a358039 100644 Binary files a/docs/reference/html/classxmlpp_1_1ContentNode__inherit__graph.png and b/docs/reference/html/classxmlpp_1_1ContentNode__inherit__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1Document-members.html b/docs/reference/html/classxmlpp_1_1Document-members.html index 0ca6867..9ec0115 100644 --- a/docs/reference/html/classxmlpp_1_1Document-members.html +++ b/docs/reference/html/classxmlpp_1_1Document-members.html @@ -2,24 +2,40 @@ + libxml++: Member List + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    This is the complete list of members for xmlpp::Document, including all inherited members. @@ -72,9 +88,14 @@ This is the complete list of members for -
    add_comment(const Glib::ustring& content)xmlpp::Document
    write_to_string_formatted(const Glib::ustring& encoding=Glib::ustring())xmlpp::Document
    ~Document()xmlpp::Document [virtual]
    ~NonCopyable()xmlpp::NonCopyable [private, virtual]
    - +
    + + + + diff --git a/docs/reference/html/classxmlpp_1_1Document.html b/docs/reference/html/classxmlpp_1_1Document.html index 9d176b1..363d95d 100644 --- a/docs/reference/html/classxmlpp_1_1Document.html +++ b/docs/reference/html/classxmlpp_1_1Document.html @@ -2,24 +2,40 @@ + libxml++: xmlpp::Document Class Reference + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    xmlpp::Document Class Reference
    -
    +

    Represents an XML document in the DOM model. More...

    @@ -60,14 +76,14 @@ Inheritance diagram for xmlpp::Document:
    Inheritance graph
    - +
    [legend]
    Collaboration diagram for xmlpp::Document:
    Collaboration graph
    - +
    [legend]

    List of all members.

    @@ -121,7 +137,7 @@ Protected Member Functions
    - + @@ -138,7 +154,7 @@ Protected Member Functions
    xmlpp::Document::Document xmlpp::Document::Document ( const Glib::ustring version = "1.0")
    - + @@ -155,7 +171,7 @@ Protected Member Functions
    xmlpp::Document::Document xmlpp::Document::Document ( _xmlDoc *  doc)
    - + @@ -172,7 +188,7 @@ Protected Member Functions
    virtual xmlpp::Document::~Document virtual xmlpp::Document::~Document ( ) [virtual]
    - + @@ -183,7 +199,7 @@ Protected Member Functions

    Append a new comment node.

    -
    Parameters:
    +
    Parameters:
    CommentNode* xmlpp::Document::add_comment CommentNode* xmlpp::Document::add_comment ( const Glib::ustring content)
    contentThe text. This should be unescaped - see ContentNode::set_content().
    @@ -198,7 +214,7 @@ Protected Member Functions
    - + @@ -220,7 +236,7 @@ Protected Member Functions

    Append a new processing instruction node.

    Since libxml++ 2.36:
    -
    Parameters:
    +
    Parameters:
    ProcessingInstructionNode* xmlpp::Document::add_processing_instruction ProcessingInstructionNode* xmlpp::Document::add_processing_instruction ( const Glib::ustring name,
    @@ -228,7 +244,7 @@ Protected Member Functions
    Returns:
    The new processing instruction node.
    -
    Exceptions:
    +
    Exceptions:
    nameThe name of the application to which the instruction is directed.
    contentThe content of the instruction. This should be unescaped - see ContentNode::set_content().
    internal_error
    @@ -242,7 +258,7 @@ Protected Member Functions
    - + @@ -260,7 +276,7 @@ Protected Member Functions
    _xmlDoc* xmlpp::Document::cobj _xmlDoc* xmlpp::Document::cobj ( )
    - + @@ -278,7 +294,7 @@ Protected Member Functions
    const _xmlDoc* xmlpp::Document::cobj const _xmlDoc* xmlpp::Document::cobj ( ) const
    - + @@ -305,7 +321,7 @@ Protected Member Functions

    Creates the root node.

    -
    Parameters:
    +
    Parameters:
    Element* xmlpp::Document::create_root_node Element* xmlpp::Document::create_root_node ( const Glib::ustring name,
    @@ -322,7 +338,7 @@ Protected Member Functions
    nameThe node's name.
    ns_uriThe namespace URI. A namespace declaration will be added to this node, because it could not have been declared before.
    - + @@ -343,7 +359,7 @@ Protected Member Functions

    Creates a root node by importing the node from another document, without affecting the source node.

    -
    Parameters:
    +
    Parameters:
    Element* xmlpp::Document::create_root_node_by_import Element* xmlpp::Document::create_root_node_by_import ( const Node node,
    @@ -359,7 +375,7 @@ Protected Member Functions
    nodeThe node to copy and insert as the root node of the document
    recursiveWhether to import the child nodes also. Defaults to true.
    - + @@ -376,7 +392,7 @@ Protected Member Functions
    Glib::ustring xmlpp::Document::get_encoding Glib::ustring xmlpp::Document::get_encoding ( ) const
    - + @@ -388,7 +404,7 @@ Protected Member Functions

    Retrieve an Entity.

    The entity can be from an external subset or internally declared.

    -
    Parameters:
    +
    Parameters:
    _xmlEntity* xmlpp::Document::get_entity _xmlEntity* xmlpp::Document::get_entity ( const Glib::ustring name)
    nameThe name of the entity to get.
    @@ -403,7 +419,7 @@ Protected Member Functions
    - + @@ -419,7 +435,7 @@ Protected Member Functions
    Dtd* xmlpp::Document::get_internal_subset Dtd* xmlpp::Document::get_internal_subset ( ) const
    - + @@ -439,7 +455,7 @@ Protected Member Functions
    Element* xmlpp::Document::get_root_node Element* xmlpp::Document::get_root_node ( ) const
    - + @@ -478,7 +494,7 @@ Protected Member Functions

    Add an Entity declaration to the document.

    -
    Parameters:
    +
    Parameters:
    virtual void xmlpp::Document::set_entity_declaration virtual void xmlpp::Document::set_entity_declaration ( const Glib::ustring name,
    @@ -496,7 +512,7 @@ Protected Member Functions
    nameThe name of the entity that will be used in an entity reference.
    typeThe type of entity.
    - + @@ -529,7 +545,7 @@ Protected Member Functions
    void xmlpp::Document::set_internal_subset void xmlpp::Document::set_internal_subset ( const Glib::ustring name,
    - + @@ -550,7 +566,7 @@ Protected Member Functions

    Write the document to a file.

    -
    Parameters:
    +
    Parameters:
    void xmlpp::Document::write_to_file void xmlpp::Document::write_to_file ( const Glib::ustring filename,
    @@ -565,7 +581,7 @@ Protected Member Functions
    filename
    encodingIf not provided, UTF-8 is used
    - + @@ -587,7 +603,7 @@ Protected Member Functions

    Write the document to a file.

    The output is formatted by inserting whitespaces, which is easier to read for a human, but may insert unwanted significant whitespaces. Use with care !

    -
    Parameters:
    +
    Parameters:
    void xmlpp::Document::write_to_file_formatted void xmlpp::Document::write_to_file_formatted ( const Glib::ustring filename,
    @@ -602,7 +618,7 @@ Protected Member Functions
    filename
    encodingIf not provided, UTF-8 is used
    - + @@ -623,7 +639,7 @@ Protected Member Functions

    Write the document to a std::ostream.

    -
    Parameters:
    +
    Parameters:
    void xmlpp::Document::write_to_stream void xmlpp::Document::write_to_stream ( std::ostream &  output,
    @@ -639,7 +655,7 @@ Protected Member Functions
    outputA reference to the stream in which the document will be written
    encodingIf not provided, UTF-8 is used
    - + @@ -661,7 +677,7 @@ Protected Member Functions

    Write the document to a std::ostream.

    The output is formatted by inserting whitespaces, which is easier to read for a human, but may insert unwanted significant whitespaces. Use with care !

    -
    Parameters:
    +
    Parameters:
    void xmlpp::Document::write_to_stream_formatted void xmlpp::Document::write_to_stream_formatted ( std::ostream &  output,
    @@ -677,7 +693,7 @@ Protected Member Functions
    outputA reference to the stream in which the document will be written
    encodingIf not provided, UTF-8 is used
    - + @@ -688,7 +704,7 @@ Protected Member Functions

    Write the document to the memory.

    -
    Parameters:
    +
    Parameters:
    Glib::ustring xmlpp::Document::write_to_string Glib::ustring xmlpp::Document::write_to_string ( const Glib::ustring encoding = Glib::ustring())
    encodingIf not provided, UTF-8 is used
    @@ -702,7 +718,7 @@ Protected Member Functions
    - + @@ -714,7 +730,7 @@ Protected Member Functions

    Write the document to the memory.

    The output is formatted by inserting whitespaces, which is easier to read for a human, but may insert unwanted significant whitespaces. Use with care !

    -
    Parameters:
    +
    Parameters:
    Glib::ustring xmlpp::Document::write_to_string_formatted Glib::ustring xmlpp::Document::write_to_string_formatted ( const Glib::ustring encoding = Glib::ustring())
    encodingIf not provided, UTF-8 is used
    @@ -727,9 +743,14 @@ Protected Member Functions
    The documentation for this class was generated from the following file:
    • document.h
    -
    - +
    + + + + diff --git a/docs/reference/html/classxmlpp_1_1Document__coll__graph.png b/docs/reference/html/classxmlpp_1_1Document__coll__graph.png index 0cfb072..4be720b 100644 Binary files a/docs/reference/html/classxmlpp_1_1Document__coll__graph.png and b/docs/reference/html/classxmlpp_1_1Document__coll__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1Document__inherit__graph.png b/docs/reference/html/classxmlpp_1_1Document__inherit__graph.png index 0cfb072..4be720b 100644 Binary files a/docs/reference/html/classxmlpp_1_1Document__inherit__graph.png and b/docs/reference/html/classxmlpp_1_1Document__inherit__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1DomParser-members.html b/docs/reference/html/classxmlpp_1_1DomParser-members.html index 20036c9..ded8f4d 100644 --- a/docs/reference/html/classxmlpp_1_1DomParser-members.html +++ b/docs/reference/html/classxmlpp_1_1DomParser-members.html @@ -2,24 +2,40 @@ + libxml++: Member List + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    This is the complete list of members for xmlpp::DomParser, including all inherited members. @@ -93,9 +109,14 @@ This is the complete list of members for -
    callback_error_or_warning(MsgType msg_type, void* ctx, const char* msg, va_list var_args)xmlpp::Parser [protected, static]
    validate_warning_xmlpp::Parser [protected]
    ~DomParser()xmlpp::DomParser [virtual]
    ~Parser()xmlpp::Parser [virtual]
    - +
    + + + + diff --git a/docs/reference/html/classxmlpp_1_1DomParser.html b/docs/reference/html/classxmlpp_1_1DomParser.html index 0a88bfb..300fc43 100644 --- a/docs/reference/html/classxmlpp_1_1DomParser.html +++ b/docs/reference/html/classxmlpp_1_1DomParser.html @@ -2,24 +2,40 @@ + libxml++: xmlpp::DomParser Class Reference + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    xmlpp::DomParser Class Reference
    -
    +

    DOM XML parser. More...

    @@ -61,14 +77,14 @@ Inheritance diagram for xmlpp::DomParser:
    Inheritance graph
    - +
    [legend]
    Collaboration diagram for xmlpp::DomParser:
    Collaboration graph
    - +
    [legend]

    List of all members.

    @@ -107,7 +123,7 @@ Protected Attributes
    - + @@ -123,7 +139,7 @@ Protected Attributes
    xmlpp::DomParser::DomParser xmlpp::DomParser::DomParser ( )
    - + @@ -144,13 +160,13 @@ Protected Attributes

    Instantiate the parser and parse a document immediately.

    -
    Exceptions:
    +
    Exceptions:
    xmlpp::DomParser::DomParser xmlpp::DomParser::DomParser ( const Glib::ustring filename,
    exception
    -
    Parameters:
    +
    Parameters:
    @@ -165,7 +181,7 @@ Protected Attributes
    filenameThe path to the file.
    validateWhether the parser should validate the XML.
    - + @@ -182,7 +198,7 @@ Protected Attributes
    virtual xmlpp::DomParser::~DomParser virtual xmlpp::DomParser::~DomParser ( ) [virtual]
    - + @@ -198,7 +214,7 @@ Protected Attributes
    Document* xmlpp::DomParser::get_document Document* xmlpp::DomParser::get_document ( )
    - + @@ -232,7 +248,7 @@ Protected Attributes
    const Document* xmlpp::DomParser::get_document const Document* xmlpp::DomParser::get_document ( ) const
    - + @@ -248,7 +264,7 @@ Protected Attributes
    virtual void xmlpp::DomParser::parse_context virtual void xmlpp::DomParser::parse_context ( ) [protected, virtual]
    - + @@ -259,13 +275,13 @@ Protected Attributes

    Parse an XML document from a file.

    -
    Exceptions:
    +
    Exceptions:
    virtual void xmlpp::DomParser::parse_file virtual void xmlpp::DomParser::parse_file ( const Glib::ustring filename)
    exception
    -
    Parameters:
    +
    Parameters:
    filenameThe path to the file.
    @@ -281,7 +297,7 @@ Protected Attributes
    - + @@ -292,13 +308,13 @@ Protected Attributes

    Parse an XML document from a string.

    -
    Exceptions:
    +
    Exceptions:
    virtual void xmlpp::DomParser::parse_memory virtual void xmlpp::DomParser::parse_memory ( const Glib::ustring contents)
    exception
    -
    Parameters:
    +
    Parameters:
    contentsThe XML document as a string.
    @@ -314,7 +330,7 @@ Protected Attributes
    - + @@ -335,13 +351,13 @@ Protected Attributes

    Parse an XML document from raw memory.

    -
    Exceptions:
    +
    Exceptions:
    void xmlpp::DomParser::parse_memory_raw void xmlpp::DomParser::parse_memory_raw ( const unsigned char *  contents,
    exception
    -
    Parameters:
    +
    Parameters:
    @@ -356,7 +372,7 @@ Protected Attributes
    contentsThe XML document as an array of bytes.
    bytes_countThe number of bytes in the contents array.
    - + @@ -367,13 +383,13 @@ Protected Attributes

    Parse an XML document from a stream.

    -
    Exceptions:
    +
    Exceptions:
    virtual void xmlpp::DomParser::parse_stream virtual void xmlpp::DomParser::parse_stream ( std::istream &  in)
    exception
    -
    Parameters:
    +
    Parameters:
    inThe stream.
    @@ -389,7 +405,7 @@ Protected Attributes
    - + @@ -419,9 +435,14 @@ Protected Attributes
    The documentation for this class was generated from the following file:
    • parsers/domparser.h
    - - + + + + + diff --git a/docs/reference/html/classxmlpp_1_1DomParser__coll__graph.png b/docs/reference/html/classxmlpp_1_1DomParser__coll__graph.png index 3a3703e..282831a 100644 Binary files a/docs/reference/html/classxmlpp_1_1DomParser__coll__graph.png and b/docs/reference/html/classxmlpp_1_1DomParser__coll__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1DomParser__inherit__graph.png b/docs/reference/html/classxmlpp_1_1DomParser__inherit__graph.png index 869d61f..f2ac51a 100644 Binary files a/docs/reference/html/classxmlpp_1_1DomParser__inherit__graph.png and b/docs/reference/html/classxmlpp_1_1DomParser__inherit__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1Dtd-members.html b/docs/reference/html/classxmlpp_1_1Dtd-members.html index df0f554..1ddde18 100644 --- a/docs/reference/html/classxmlpp_1_1Dtd-members.html +++ b/docs/reference/html/classxmlpp_1_1Dtd-members.html @@ -2,24 +2,40 @@ +libxml++: Member List + - + + + + - -
    +
    + +
    virtual void xmlpp::DomParser::release_underlying virtual void xmlpp::DomParser::release_underlying ( ) [protected, virtual]
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    This is the complete list of members for xmlpp::Dtd, including all inherited members. @@ -56,9 +72,14 @@ This is the complete list of members for -
    cobj()xmlpp::Dtd
    get_name() const xmlpp::Dtd
    get_system_id() const xmlpp::Dtd
    ~Dtd()xmlpp::Dtd
    - +
    + + + + diff --git a/docs/reference/html/classxmlpp_1_1Dtd.html b/docs/reference/html/classxmlpp_1_1Dtd.html index 0318098..890957d 100644 --- a/docs/reference/html/classxmlpp_1_1Dtd.html +++ b/docs/reference/html/classxmlpp_1_1Dtd.html @@ -2,24 +2,40 @@ + libxml++: xmlpp::Dtd Class Reference + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    xmlpp::Dtd Class Reference
    -
    +

    Represents XML DTDs. More...

    @@ -77,7 +93,7 @@ Public Member Functions
    - + @@ -94,7 +110,7 @@ Public Member Functions
    xmlpp::Dtd::Dtd xmlpp::Dtd::Dtd ( _xmlDtd *  dtd)
    - + @@ -111,7 +127,7 @@ Public Member Functions
    xmlpp::Dtd::~Dtd xmlpp::Dtd::~Dtd ( )
    - + @@ -129,7 +145,7 @@ Public Member Functions
    _xmlDtd* xmlpp::Dtd::cobj _xmlDtd* xmlpp::Dtd::cobj ( )
    - + @@ -147,7 +163,7 @@ Public Member Functions
    const _xmlDtd* xmlpp::Dtd::cobj const _xmlDtd* xmlpp::Dtd::cobj ( ) const
    - + @@ -163,7 +179,7 @@ Public Member Functions
    Glib::ustring xmlpp::Dtd::get_external_id Glib::ustring xmlpp::Dtd::get_external_id ( ) const
    - + @@ -179,7 +195,7 @@ Public Member Functions
    Glib::ustring xmlpp::Dtd::get_name Glib::ustring xmlpp::Dtd::get_name ( ) const
    - + @@ -193,9 +209,14 @@ Public Member Functions
    The documentation for this class was generated from the following file:
    • dtd.h
    - - + + + + + diff --git a/docs/reference/html/classxmlpp_1_1DtdValidator-members.html b/docs/reference/html/classxmlpp_1_1DtdValidator-members.html index b6490b8..dea6b39 100644 --- a/docs/reference/html/classxmlpp_1_1DtdValidator-members.html +++ b/docs/reference/html/classxmlpp_1_1DtdValidator-members.html @@ -2,24 +2,40 @@ +libxml++: Member List + - + + + + - -
    +
    + +
    Glib::ustring xmlpp::Dtd::get_system_id Glib::ustring xmlpp::Dtd::get_system_id ( ) const
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    This is the complete list of members for xmlpp::DtdValidator, including all inherited members. @@ -77,9 +93,14 @@ This is the complete list of members for -
    callback_validity_error(void* ctx, const char* msg,...)xmlpp::Validator [protected, static]
    Validator()xmlpp::Validator
    ~DtdValidator()xmlpp::DtdValidator [virtual]
    ~Validator()xmlpp::Validator [virtual]
    - +
    + + + + diff --git a/docs/reference/html/classxmlpp_1_1DtdValidator.html b/docs/reference/html/classxmlpp_1_1DtdValidator.html index abaa9fd..c1eda97 100644 --- a/docs/reference/html/classxmlpp_1_1DtdValidator.html +++ b/docs/reference/html/classxmlpp_1_1DtdValidator.html @@ -2,24 +2,40 @@ + libxml++: xmlpp::DtdValidator Class Reference + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    xmlpp::DtdValidator Class Reference
    -
    +

    XML DOM parser. More...

    @@ -61,14 +77,14 @@ Inheritance diagram for xmlpp::DtdValidator:
    Inheritance graph
    - +
    [legend]
    Collaboration diagram for xmlpp::DtdValidator:
    Collaboration graph
    - +
    [legend]

    List of all members.

    @@ -103,7 +119,7 @@ Protected Attributes
    - + @@ -119,7 +135,7 @@ Protected Attributes
    xmlpp::DtdValidator::DtdValidator xmlpp::DtdValidator::DtdValidator ( )
    - + @@ -136,7 +152,7 @@ Protected Attributes
    xmlpp::DtdValidator::DtdValidator xmlpp::DtdValidator::DtdValidator ( const Glib::ustring file)
    - + @@ -163,7 +179,7 @@ Protected Attributes
    xmlpp::DtdValidator::DtdValidator xmlpp::DtdValidator::DtdValidator ( const Glib::ustring external,
    - + @@ -180,7 +196,7 @@ Protected Attributes
    virtual xmlpp::DtdValidator::~DtdValidator virtual xmlpp::DtdValidator::~DtdValidator ( ) [virtual]
    - + @@ -196,7 +212,7 @@ Protected Attributes
    Dtd* xmlpp::DtdValidator::get_dtd Dtd* xmlpp::DtdValidator::get_dtd ( )
    - + @@ -230,7 +246,7 @@ Protected Attributes
    const Dtd* xmlpp::DtdValidator::get_dtd const Dtd* xmlpp::DtdValidator::get_dtd ( ) const
    - + @@ -247,7 +263,7 @@ Protected Attributes
    virtual void xmlpp::DtdValidator::parse_file virtual void xmlpp::DtdValidator::parse_file ( const Glib::ustring filename)
    - + @@ -264,7 +280,7 @@ Protected Attributes
    virtual void xmlpp::DtdValidator::parse_memory virtual void xmlpp::DtdValidator::parse_memory ( const Glib::ustring contents)
    - + @@ -281,7 +297,7 @@ Protected Attributes
    virtual void xmlpp::DtdValidator::parse_stream virtual void xmlpp::DtdValidator::parse_stream ( std::istream &  in)
    - + @@ -308,7 +324,7 @@ Protected Attributes
    virtual void xmlpp::DtdValidator::parse_subset virtual void xmlpp::DtdValidator::parse_subset ( const Glib::ustring external,
    - + @@ -326,7 +342,7 @@ Protected Attributes
    virtual void xmlpp::DtdValidator::release_underlying virtual void xmlpp::DtdValidator::release_underlying ( ) [protected, virtual]
    - + @@ -355,9 +371,14 @@ Protected Attributes
    The documentation for this class was generated from the following file:
    • validators/dtdvalidator.h
    - - + + + + + diff --git a/docs/reference/html/classxmlpp_1_1DtdValidator__coll__graph.png b/docs/reference/html/classxmlpp_1_1DtdValidator__coll__graph.png index d1bfa1a..de0ec54 100644 Binary files a/docs/reference/html/classxmlpp_1_1DtdValidator__coll__graph.png and b/docs/reference/html/classxmlpp_1_1DtdValidator__coll__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1DtdValidator__inherit__graph.png b/docs/reference/html/classxmlpp_1_1DtdValidator__inherit__graph.png index dfdd54e..fa1d8dc 100644 Binary files a/docs/reference/html/classxmlpp_1_1DtdValidator__inherit__graph.png and b/docs/reference/html/classxmlpp_1_1DtdValidator__inherit__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1Element-members.html b/docs/reference/html/classxmlpp_1_1Element-members.html index 21f40ad..3bd1d8a 100644 --- a/docs/reference/html/classxmlpp_1_1Element-members.html +++ b/docs/reference/html/classxmlpp_1_1Element-members.html @@ -2,24 +2,40 @@ +libxml++: Member List + - + + + + - -
    +
    + +
    bool xmlpp::DtdValidator::validate bool xmlpp::DtdValidator::validate ( const Document doc)
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    This is the complete list of members for xmlpp::Element, including all inherited members. @@ -76,6 +92,8 @@ This is the complete list of members for + + @@ -104,9 +122,14 @@ This is the complete list of members for -
    add_child(const Glib::ustring& name, const Glib::ustring& ns_prefix=Glib::ustring())xmlpp::Node
    get_child_text() const xmlpp::Element
    get_children(const Glib::ustring& name=Glib::ustring())xmlpp::Node
    get_children(const Glib::ustring& name=Glib::ustring()) const xmlpp::Node
    get_first_child(const Glib::ustring& name=Glib::ustring()) const xmlpp::Node
    get_first_child(const Glib::ustring& name=Glib::ustring())xmlpp::Node
    get_line() const xmlpp::Node
    get_name() const xmlpp::Node
    get_namespace_prefix() const xmlpp::Node
    ~Element()xmlpp::Element [virtual]
    ~Node()xmlpp::Node [virtual]
    ~NonCopyable()xmlpp::NonCopyable [protected, virtual]
    - +
    + + + + diff --git a/docs/reference/html/classxmlpp_1_1Element.html b/docs/reference/html/classxmlpp_1_1Element.html index 3a4e73a..075db02 100644 --- a/docs/reference/html/classxmlpp_1_1Element.html +++ b/docs/reference/html/classxmlpp_1_1Element.html @@ -2,24 +2,40 @@ + libxml++: xmlpp::Element Class Reference + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    xmlpp::Element Class Reference
    -
    +

    Element nodes have attributes as well as child nodes. More...

    @@ -61,14 +77,14 @@ Inheritance diagram for xmlpp::Element:
    Inheritance graph
    - +
    [legend]
    Collaboration diagram for xmlpp::Element:
    Collaboration graph
    - +
    [legend]

    List of all members.

    @@ -143,7 +159,7 @@ Protected Member Functions
    - + @@ -160,7 +176,7 @@ Protected Member Functions
    xmlpp::Element::Element xmlpp::Element::Element ( _xmlNode *  node)
    - + @@ -177,7 +193,7 @@ Protected Member Functions
    virtual xmlpp::Element::~Element virtual xmlpp::Element::~Element ( ) [virtual]
    - + @@ -188,7 +204,7 @@ Protected Member Functions

    Append a new CDATA node.

    -
    Parameters:
    +
    Parameters:
    CdataNode* xmlpp::Element::add_child_cdata CdataNode* xmlpp::Element::add_child_cdata ( const Glib::ustring content)
    contentThe raw text.
    @@ -203,7 +219,7 @@ Protected Member Functions
    - + @@ -214,7 +230,7 @@ Protected Member Functions

    Append a new comment node.

    -
    Parameters:
    +
    Parameters:
    CommentNode* xmlpp::Element::add_child_comment CommentNode* xmlpp::Element::add_child_comment ( const Glib::ustring content)
    contentThe text. This should be unescaped - see ContentNode::set_content().
    @@ -229,7 +245,7 @@ Protected Member Functions
    - + @@ -243,7 +259,7 @@ Protected Member Functions

    The reference can be either an entity reference ("name" or "&name;") or a character reference ("#dec", "#xhex", "&#dec;", or "&#xhex;").

    '&' and ';' are optional. If they exist, they are stripped from the stored copy of the name. Node::get_name() returns the name without '&' and ';'. If the Document is written to an XML file, '&' and ';' are written.

    Since libxml++ 2.36:
    -
    Parameters:
    +
    Parameters:
    EntityReference* xmlpp::Element::add_child_entity_reference EntityReference* xmlpp::Element::add_child_entity_reference ( const Glib::ustring name)
    nameThe name of the entity.
    @@ -258,7 +274,7 @@ Protected Member Functions
    - + @@ -280,7 +296,7 @@ Protected Member Functions

    Append a new processing instruction node.

    Since libxml++ 2.36:
    -
    Parameters:
    +
    Parameters:
    ProcessingInstructionNode* xmlpp::Element::add_child_processing_instruction ProcessingInstructionNode* xmlpp::Element::add_child_processing_instruction ( const Glib::ustring name,
    @@ -291,36 +307,24 @@ Protected Member Functions - +
    nameThe name of the application to which the instruction is directed.
    contentThe content of the instruction. This should be unescaped - see ContentNode::set_content().
    - + - - - - - - - - - + - -
    TextNode* xmlpp::Element::add_child_text TextNode* xmlpp::Element::add_child_text (xmlpp::Nodeprevious_sibling,
    const Glib::ustringcontent = Glib::ustring() 
    content = Glib::ustring()) )
    -

    Add a new text node after the specified existing child node.

    -
    Since libxml++ 2.24:
    -
    Parameters:
    +

    Append a new text node.

    +
    Parameters:
    -
    previous_siblingAn existing child node.
    contentThe text. This should be unescaped - see ContentNode::set_content().
    @@ -329,24 +333,36 @@ Protected Member Functions
    - +
    - + + + + + + + - + + + + +
    TextNode* xmlpp::Element::add_child_text TextNode* xmlpp::Element::add_child_text (xmlpp::Nodeprevious_sibling,
    const Glib::ustringcontent = Glib::ustring())content = Glib::ustring() 
    )
    -

    Append a new text node.

    -
    Parameters:
    +

    Add a new text node after the specified existing child node.

    +
    Since libxml++ 2.24:
    +
    Parameters:
    +
    previous_siblingAn existing child node.
    contentThe text. This should be unescaped - see ContentNode::set_content().
    @@ -360,7 +376,7 @@ Protected Member Functions
    - + @@ -382,7 +398,7 @@ Protected Member Functions

    Add a new text node before the specified existing child node.

    Since libxml++ 2.24:
    -
    Parameters:
    +
    Parameters:
    TextNode* xmlpp::Element::add_child_text_before TextNode* xmlpp::Element::add_child_text_before ( xmlpp::Node next_sibling,
    @@ -398,7 +414,7 @@ Protected Member Functions
    next_siblingAn existing child node.
    contentThe text. This should be unescaped - see ContentNode::set_content().
    - + @@ -419,7 +435,7 @@ Protected Member Functions

    Get the attribute with this name, and optionally with this namespace.

    -
    Parameters:
    +
    Parameters:
    Attribute* xmlpp::Element::get_attribute Attribute* xmlpp::Element::get_attribute ( const Glib::ustring name,
    @@ -435,7 +451,7 @@ Protected Member Functions
    nameThe name of the attribute that will be retrieved.
    ns_prefixNamespace prefix.
    - + @@ -457,7 +473,7 @@ Protected Member Functions

    Get the value of the attribute with this name, and optionally with this namespace.

    For finer control, you might use get_attribute() and use the methods of the Attribute class.

    -
    Parameters:
    +
    Parameters:
    Glib::ustring xmlpp::Element::get_attribute_value Glib::ustring xmlpp::Element::get_attribute_value ( const Glib::ustring name,
    @@ -474,7 +490,7 @@ Protected Member Functions
    nameThe name of the attribute whose value will be retrieved.
    ns_prefixNamespace prefix.
    - + @@ -493,7 +509,7 @@ Protected Member Functions
    AttributeList xmlpp::Element::get_attributes AttributeList xmlpp::Element::get_attributes ( )
    - + @@ -512,7 +528,7 @@ Protected Member Functions
    const AttributeList xmlpp::Element::get_attributes const AttributeList xmlpp::Element::get_attributes ( ) const
    - + @@ -532,7 +548,7 @@ Protected Member Functions
    TextNode* xmlpp::Element::get_child_text TextNode* xmlpp::Element::get_child_text ( )
    - + @@ -552,7 +568,7 @@ Protected Member Functions
    const TextNode* xmlpp::Element::get_child_text const TextNode* xmlpp::Element::get_child_text ( ) const
    - + @@ -569,7 +585,7 @@ Protected Member Functions
    Glib::ustring xmlpp::Element::get_namespace_uri_for_prefix Glib::ustring xmlpp::Element::get_namespace_uri_for_prefix ( const Glib::ustring ns_prefix)
    - + @@ -589,7 +605,7 @@ Protected Member Functions
    bool xmlpp::Element::has_child_text bool xmlpp::Element::has_child_text ( ) const
    - + @@ -610,7 +626,7 @@ Protected Member Functions

    Remove the attribute with this name, and optionally with this namespace.

    -
    Parameters:
    +
    Parameters:
    void xmlpp::Element::remove_attribute void xmlpp::Element::remove_attribute ( const Glib::ustring name,
    @@ -625,7 +641,7 @@ Protected Member Functions
    nameThe name of the attribute to be removed
    ns_prefixNamespace prefix. If specified, the attribute will be removed only if the attribute has this namespace.
    - + @@ -653,7 +669,7 @@ Protected Member Functions

    Set the value of the attribute with this name, and optionally with this namespace.

    A matching attribute will be added if no matching attribute already exists. For finer control, you might want to use get_attribute() and use the methods of the Attribute class.

    -
    Parameters:
    +
    Parameters:
    Attribute* xmlpp::Element::set_attribute Attribute* xmlpp::Element::set_attribute ( const Glib::ustring name,
    @@ -662,7 +678,7 @@ Protected Member Functions
    Returns:
    The attribute that was changed, or 0 is no suitable Attribute was found.
    -
    Exceptions:
    +
    Exceptions:
    nameThe name of the attribute whose value will change.
    valueThe new value for the attribute
    exception
    @@ -676,7 +692,7 @@ Protected Member Functions
    - + @@ -688,7 +704,7 @@ Protected Member Functions

    Set the text of the first text node, adding one if necessary.

    This is a convenience method, meant as an alternative to iterating over all the child nodes to find the first suitable node then and setting the text directly.

    -
    Parameters:
    +
    Parameters:
    void xmlpp::Element::set_child_text void xmlpp::Element::set_child_text ( const Glib::ustring content)
    contentThe text. This should be unescaped - see ContentNode::set_content().
    @@ -702,7 +718,7 @@ Protected Member Functions
    - + @@ -723,7 +739,7 @@ Protected Member Functions

    This adds a namespace declaration to this node which will apply to this node and all children.

    -
    Parameters:
    +
    Parameters:
    void xmlpp::Element::set_namespace_declaration void xmlpp::Element::set_namespace_declaration ( const Glib::ustring ns_uri,
    @@ -736,9 +752,14 @@ Protected Member Functions
    The documentation for this class was generated from the following file:
    • nodes/element.h
    - - + + + + + diff --git a/docs/reference/html/classxmlpp_1_1Element__coll__graph.png b/docs/reference/html/classxmlpp_1_1Element__coll__graph.png index eca24df..7b253d8 100644 Binary files a/docs/reference/html/classxmlpp_1_1Element__coll__graph.png and b/docs/reference/html/classxmlpp_1_1Element__coll__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1Element__inherit__graph.png b/docs/reference/html/classxmlpp_1_1Element__inherit__graph.png index eca24df..7b253d8 100644 Binary files a/docs/reference/html/classxmlpp_1_1Element__inherit__graph.png and b/docs/reference/html/classxmlpp_1_1Element__inherit__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1EntityDeclaration-members.html b/docs/reference/html/classxmlpp_1_1EntityDeclaration-members.html index a2509ad..8696f9b 100644 --- a/docs/reference/html/classxmlpp_1_1EntityDeclaration-members.html +++ b/docs/reference/html/classxmlpp_1_1EntityDeclaration-members.html @@ -2,24 +2,40 @@ +libxml++: Member List + - + + + + - -
    +
    + +
    ns_uriThe namespace to associate with the prefix, or to use as the default namespace if no prefix is specified.
    ns_prefixThe namespace prefix. If no prefix is specified then the namespace URI will be the default namespace.
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    This is the complete list of members for xmlpp::EntityDeclaration, including all inherited members. @@ -64,6 +80,8 @@ This is the complete list of members for + + @@ -91,9 +109,14 @@ This is the complete list of members for -
    add_child(const Glib::ustring& name, const Glib::ustring& ns_prefix=Glib::ustring())xmlpp::Node
    get_children(const Glib::ustring& name=Glib::ustring())xmlpp::Node
    get_children(const Glib::ustring& name=Glib::ustring()) const xmlpp::Node
    get_content() const xmlpp::ContentNode
    get_first_child(const Glib::ustring& name=Glib::ustring()) const xmlpp::Node
    get_first_child(const Glib::ustring& name=Glib::ustring())xmlpp::Node
    get_line() const xmlpp::Node
    get_name() const xmlpp::Node
    get_namespace_prefix() const xmlpp::Node
    ~EntityDeclaration()xmlpp::EntityDeclaration [virtual]
    ~Node()xmlpp::Node [virtual]
    ~NonCopyable()xmlpp::NonCopyable [protected, virtual]
    - +
    + + + + diff --git a/docs/reference/html/classxmlpp_1_1EntityDeclaration.html b/docs/reference/html/classxmlpp_1_1EntityDeclaration.html index 24b3c50..3f8a6da 100644 --- a/docs/reference/html/classxmlpp_1_1EntityDeclaration.html +++ b/docs/reference/html/classxmlpp_1_1EntityDeclaration.html @@ -2,24 +2,40 @@ + libxml++: xmlpp::EntityDeclaration Class Reference + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    xmlpp::EntityDeclaration Class Reference
    -
    +

    Entity declaration. More...

    @@ -59,14 +75,14 @@ Inheritance diagram for xmlpp::EntityDeclaration:
    Inheritance graph
    - +
    [legend]
    Collaboration diagram for xmlpp::EntityDeclaration:
    Collaboration graph
    - +
    [legend]

    List of all members.

    @@ -94,7 +110,7 @@ Public Member Functions
    - + @@ -111,7 +127,7 @@ Public Member Functions
    xmlpp::EntityDeclaration::EntityDeclaration xmlpp::EntityDeclaration::EntityDeclaration ( _xmlNode *  node)
    - + @@ -128,7 +144,7 @@ Public Member Functions
    virtual xmlpp::EntityDeclaration::~EntityDeclaration virtual xmlpp::EntityDeclaration::~EntityDeclaration ( ) [virtual]
    - + @@ -148,7 +164,7 @@ Public Member Functions
    _xmlEntity* xmlpp::EntityDeclaration::cobj _xmlEntity* xmlpp::EntityDeclaration::cobj ( )
    - + @@ -168,7 +184,7 @@ Public Member Functions
    const _xmlEntity* xmlpp::EntityDeclaration::cobj const _xmlEntity* xmlpp::EntityDeclaration::cobj ( ) const
    - + @@ -187,7 +203,7 @@ Public Member Functions
    Glib::ustring xmlpp::EntityDeclaration::get_original_text Glib::ustring xmlpp::EntityDeclaration::get_original_text ( ) const
    - + @@ -205,9 +221,14 @@ Public Member Functions
    The documentation for this class was generated from the following file:
    • nodes/entitydeclaration.h
    - - + + + + + diff --git a/docs/reference/html/classxmlpp_1_1EntityDeclaration__coll__graph.png b/docs/reference/html/classxmlpp_1_1EntityDeclaration__coll__graph.png index 9ce8a85..c07b3bc 100644 Binary files a/docs/reference/html/classxmlpp_1_1EntityDeclaration__coll__graph.png and b/docs/reference/html/classxmlpp_1_1EntityDeclaration__coll__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1EntityDeclaration__inherit__graph.png b/docs/reference/html/classxmlpp_1_1EntityDeclaration__inherit__graph.png index 9ce8a85..c07b3bc 100644 Binary files a/docs/reference/html/classxmlpp_1_1EntityDeclaration__inherit__graph.png and b/docs/reference/html/classxmlpp_1_1EntityDeclaration__inherit__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1EntityReference-members.html b/docs/reference/html/classxmlpp_1_1EntityReference-members.html index 56c0575..42358a6 100644 --- a/docs/reference/html/classxmlpp_1_1EntityReference-members.html +++ b/docs/reference/html/classxmlpp_1_1EntityReference-members.html @@ -2,24 +2,40 @@ +libxml++: Member List + - + + + + - -
    +
    + +
    Glib::ustring xmlpp::EntityDeclaration::get_resolved_text Glib::ustring xmlpp::EntityDeclaration::get_resolved_text ( ) const
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    This is the complete list of members for xmlpp::EntityReference, including all inherited members. @@ -62,6 +78,8 @@ This is the complete list of members for + + @@ -86,9 +104,14 @@ This is the complete list of members for -
    add_child(const Glib::ustring& name, const Glib::ustring& ns_prefix=Glib::ustring())xmlpp::Node
    free_wrappers(_xmlNode* attr)xmlpp::Node [static]
    get_children(const Glib::ustring& name=Glib::ustring())xmlpp::Node
    get_children(const Glib::ustring& name=Glib::ustring()) const xmlpp::Node
    get_first_child(const Glib::ustring& name=Glib::ustring()) const xmlpp::Node
    get_first_child(const Glib::ustring& name=Glib::ustring())xmlpp::Node
    get_line() const xmlpp::Node
    get_name() const xmlpp::Node
    get_namespace_prefix() const xmlpp::Node
    ~EntityReference()xmlpp::EntityReference [virtual]
    ~Node()xmlpp::Node [virtual]
    ~NonCopyable()xmlpp::NonCopyable [protected, virtual]
    - +
    + + + + diff --git a/docs/reference/html/classxmlpp_1_1EntityReference.html b/docs/reference/html/classxmlpp_1_1EntityReference.html index c951531..d5d3b2c 100644 --- a/docs/reference/html/classxmlpp_1_1EntityReference.html +++ b/docs/reference/html/classxmlpp_1_1EntityReference.html @@ -2,24 +2,40 @@ + libxml++: xmlpp::EntityReference Class Reference + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    xmlpp::EntityReference Class Reference
    -
    +

    Entity references refer to previously declared entities. More...

    @@ -59,14 +75,14 @@ Inheritance diagram for xmlpp::EntityReference:
    Inheritance graph
    - +
    [legend]
    Collaboration diagram for xmlpp::EntityReference:
    Collaboration graph
    - +
    [legend]

    List of all members.

    @@ -89,7 +105,7 @@ Public Member Functions
    - + @@ -106,7 +122,7 @@ Public Member Functions
    xmlpp::EntityReference::EntityReference xmlpp::EntityReference::EntityReference ( _xmlNode *  node)
    - + @@ -123,7 +139,7 @@ Public Member Functions
    virtual xmlpp::EntityReference::~EntityReference virtual xmlpp::EntityReference::~EntityReference ( ) [virtual]
    - + @@ -142,7 +158,7 @@ Public Member Functions
    Glib::ustring xmlpp::EntityReference::get_original_text Glib::ustring xmlpp::EntityReference::get_original_text ( ) const
    - + @@ -160,9 +176,14 @@ Public Member Functions
    The documentation for this class was generated from the following file:
    • nodes/entityreference.h
    - - + + + + + diff --git a/docs/reference/html/classxmlpp_1_1EntityReference__coll__graph.png b/docs/reference/html/classxmlpp_1_1EntityReference__coll__graph.png index 9e22ecd..8f732bf 100644 Binary files a/docs/reference/html/classxmlpp_1_1EntityReference__coll__graph.png and b/docs/reference/html/classxmlpp_1_1EntityReference__coll__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1EntityReference__inherit__graph.png b/docs/reference/html/classxmlpp_1_1EntityReference__inherit__graph.png index 9e22ecd..8f732bf 100644 Binary files a/docs/reference/html/classxmlpp_1_1EntityReference__inherit__graph.png and b/docs/reference/html/classxmlpp_1_1EntityReference__inherit__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1IStreamParserInputBuffer-members.html b/docs/reference/html/classxmlpp_1_1IStreamParserInputBuffer-members.html index 73dde6f..d309657 100644 --- a/docs/reference/html/classxmlpp_1_1IStreamParserInputBuffer-members.html +++ b/docs/reference/html/classxmlpp_1_1IStreamParserInputBuffer-members.html @@ -2,24 +2,40 @@ +libxml++: Member List + - + + + + - -
    +
    + +
    Glib::ustring xmlpp::EntityReference::get_resolved_text Glib::ustring xmlpp::EntityReference::get_resolved_text ( ) const
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    This is the complete list of members for xmlpp::IStreamParserInputBuffer, including all inherited members. @@ -57,9 +73,14 @@ This is the complete list of members for -
    cobj()xmlpp::ParserInputBuffer
    ~IStreamParserInputBuffer()xmlpp::IStreamParserInputBuffer [virtual]
    ~NonCopyable()xmlpp::NonCopyable [protected, virtual]
    ~ParserInputBuffer()xmlpp::ParserInputBuffer [virtual]
    - +
    + + + + diff --git a/docs/reference/html/classxmlpp_1_1IStreamParserInputBuffer.html b/docs/reference/html/classxmlpp_1_1IStreamParserInputBuffer.html index fac7a65..027aa0d 100644 --- a/docs/reference/html/classxmlpp_1_1IStreamParserInputBuffer.html +++ b/docs/reference/html/classxmlpp_1_1IStreamParserInputBuffer.html @@ -2,24 +2,40 @@ + libxml++: xmlpp::IStreamParserInputBuffer Class Reference + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    xmlpp::IStreamParserInputBuffer Class Reference
    -
    +

    #include <libxml++/io/istreamparserinputbuffer.h>

    @@ -57,14 +73,14 @@ Inheritance diagram for xmlpp::IStreamParserInputBuffer:
    Inheritance graph
    - +
    [legend]
    Collaboration diagram for xmlpp::IStreamParserInputBuffer:
    Collaboration graph
    - +
    [legend]

    List of all members.

    @@ -80,7 +96,7 @@ Public Member Functions
    - + @@ -89,7 +105,7 @@ Public Member Functions
    xmlpp::IStreamParserInputBuffer::IStreamParserInputBuffer xmlpp::IStreamParserInputBuffer::IStreamParserInputBuffer ( std::istream &  input)
    -
    Parameters:
    +
    Parameters:
    inputThe istream datas will be read from
    @@ -103,7 +119,7 @@ Public Member Functions
    - + @@ -117,9 +133,14 @@ Public Member Functions
    The documentation for this class was generated from the following file:
    • io/istreamparserinputbuffer.h
    - - + + + + + diff --git a/docs/reference/html/classxmlpp_1_1IStreamParserInputBuffer__coll__graph.png b/docs/reference/html/classxmlpp_1_1IStreamParserInputBuffer__coll__graph.png index 0a82cb8..9550bdb 100644 Binary files a/docs/reference/html/classxmlpp_1_1IStreamParserInputBuffer__coll__graph.png and b/docs/reference/html/classxmlpp_1_1IStreamParserInputBuffer__coll__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1IStreamParserInputBuffer__inherit__graph.png b/docs/reference/html/classxmlpp_1_1IStreamParserInputBuffer__inherit__graph.png index 0a82cb8..9550bdb 100644 Binary files a/docs/reference/html/classxmlpp_1_1IStreamParserInputBuffer__inherit__graph.png and b/docs/reference/html/classxmlpp_1_1IStreamParserInputBuffer__inherit__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1KeepBlanks-members.html b/docs/reference/html/classxmlpp_1_1KeepBlanks-members.html index 5ee0a11..c56ccf4 100644 --- a/docs/reference/html/classxmlpp_1_1KeepBlanks-members.html +++ b/docs/reference/html/classxmlpp_1_1KeepBlanks-members.html @@ -2,24 +2,40 @@ +libxml++: Member List + - + + + + - -
    +
    + +
    virtual xmlpp::IStreamParserInputBuffer::~IStreamParserInputBuffer virtual xmlpp::IStreamParserInputBuffer::~IStreamParserInputBuffer ( ) [virtual]
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    This is the complete list of members for xmlpp::KeepBlanks, including all inherited members. -
    Defaultxmlpp::KeepBlanks [static]
    KeepBlanks(bool value)xmlpp::KeepBlanks
    ~KeepBlanks()xmlpp::KeepBlanks
    - +
    + + + + diff --git a/docs/reference/html/classxmlpp_1_1KeepBlanks.html b/docs/reference/html/classxmlpp_1_1KeepBlanks.html index 9d0d948..9bffc7a 100644 --- a/docs/reference/html/classxmlpp_1_1KeepBlanks.html +++ b/docs/reference/html/classxmlpp_1_1KeepBlanks.html @@ -2,24 +2,40 @@ + libxml++: xmlpp::KeepBlanks Class Reference + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    xmlpp::KeepBlanks Class Reference
    -
    +

    This class set KeepBlanksDefault and IndentTreeOutput of libxmlpp and restore their initial value in its destructor. More...

    @@ -75,7 +91,7 @@ Static Public Attributes
    - + @@ -92,7 +108,7 @@ Static Public Attributes
    xmlpp::KeepBlanks::KeepBlanks xmlpp::KeepBlanks::KeepBlanks ( bool  value)
    - + @@ -120,9 +136,14 @@ Static Public Attributes
    The documentation for this class was generated from the following file:
    • keepblanks.h
    - - + + + + + diff --git a/docs/reference/html/classxmlpp_1_1Node-members.html b/docs/reference/html/classxmlpp_1_1Node-members.html index 87bf2bd..015b0bf 100644 --- a/docs/reference/html/classxmlpp_1_1Node-members.html +++ b/docs/reference/html/classxmlpp_1_1Node-members.html @@ -2,24 +2,40 @@ +libxml++: Member List + - + + + + - -
    +
    + +
    xmlpp::KeepBlanks::~KeepBlanks xmlpp::KeepBlanks::~KeepBlanks ( )
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    This is the complete list of members for xmlpp::Node, including all inherited members. @@ -61,6 +77,8 @@ This is the complete list of members for + + @@ -82,9 +100,14 @@ This is the complete list of members for -
    add_child(const Glib::ustring& name, const Glib::ustring& ns_prefix=Glib::ustring())xmlpp::Node
    free_wrappers(_xmlNode* attr)xmlpp::Node [static]
    get_children(const Glib::ustring& name=Glib::ustring())xmlpp::Node
    get_children(const Glib::ustring& name=Glib::ustring()) const xmlpp::Node
    get_first_child(const Glib::ustring& name=Glib::ustring()) const xmlpp::Node
    get_first_child(const Glib::ustring& name=Glib::ustring())xmlpp::Node
    get_line() const xmlpp::Node
    get_name() const xmlpp::Node
    get_namespace_prefix() const xmlpp::Node
    set_namespace(const Glib::ustring& ns_prefix)xmlpp::Node
    ~Node()xmlpp::Node [virtual]
    ~NonCopyable()xmlpp::NonCopyable [protected, virtual]
    - +
    + + + + diff --git a/docs/reference/html/classxmlpp_1_1Node.html b/docs/reference/html/classxmlpp_1_1Node.html index 5296dd0..c658a59 100644 --- a/docs/reference/html/classxmlpp_1_1Node.html +++ b/docs/reference/html/classxmlpp_1_1Node.html @@ -2,24 +2,40 @@ + libxml++: xmlpp::Node Class Reference + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    xmlpp::Node Class Reference
    -
    +

    Represents XML Nodes. More...

    @@ -62,14 +78,14 @@ Inheritance diagram for xmlpp::Node:
    Inheritance graph
    - +
    [legend]
    Collaboration diagram for xmlpp::Node:
    Collaboration graph
    - +
    [legend]

    List of all members.

    @@ -106,6 +122,10 @@ Public Member Functions  Get the previous sibling for this node .
    Nodeget_previous_sibling ()  Get the previous sibling for this node.
    +const Nodeget_first_child (const Glib::ustring& name=Glib::ustring()) const + Get the first child of this node.
    +Nodeget_first_child (const Glib::ustring& name=Glib::ustring()) + Get the first child of this node.
    NodeList get_children (const Glib::ustring& name=Glib::ustring())  Obtain the list of child nodes.
    const NodeList get_children (const Glib::ustring& name=Glib::ustring()) const @@ -179,7 +199,7 @@ Protected Member Functions
    - + @@ -196,7 +216,7 @@ Protected Member Functions
    xmlpp::Node::Node xmlpp::Node::Node ( _xmlNode *  node)
    - + @@ -213,7 +233,7 @@ Protected Member Functions
    virtual xmlpp::Node::~Node virtual xmlpp::Node::~Node ( ) [virtual]
    - + @@ -234,7 +254,7 @@ Protected Member Functions

    Add a child element to this node.

    -
    Parameters:
    +
    Parameters:
    Element* xmlpp::Node::add_child Element* xmlpp::Node::add_child ( const Glib::ustring name,
    @@ -242,7 +262,7 @@ Protected Member Functions
    Returns:
    The newly-created element
    -
    Exceptions:
    +
    Exceptions:
    nameThe new node name
    ns_prefixThe namespace prefix. If the prefix has not been declared then this method will throw an exception.
    exception
    @@ -256,7 +276,7 @@ Protected Member Functions
    - + @@ -284,7 +304,7 @@ Protected Member Functions

    Add a child element to this node after the specified existing child node.

    Since libxml++ 2.24:
    -
    Parameters:
    +
    Parameters:
    Element* xmlpp::Node::add_child Element* xmlpp::Node::add_child ( xmlpp::Node previous_sibling,
    @@ -293,7 +313,7 @@ Protected Member Functions
    Returns:
    The newly-created element
    -
    Exceptions:
    +
    Exceptions:
    previous_siblingAn existing child node.
    nameThe new node name
    exception
    @@ -307,7 +327,7 @@ Protected Member Functions
    - + @@ -335,7 +355,7 @@ Protected Member Functions

    Add a child element to this node before the specified existing child node.

    Since libxml++ 2.24:
    -
    Parameters:
    +
    Parameters:
    Element* xmlpp::Node::add_child_before Element* xmlpp::Node::add_child_before ( xmlpp::Node next_sibling,
    @@ -344,7 +364,7 @@ Protected Member Functions
    Returns:
    The newly-created element
    -
    Exceptions:
    +
    Exceptions:
    next_siblingAn existing child node.
    nameThe new node name
    exception
    @@ -358,7 +378,7 @@ Protected Member Functions
    - + @@ -369,7 +389,7 @@ Protected Member Functions

    Access the underlying libxml implementation.

    -

    Reimplemented in xmlpp::Attribute, xmlpp::AttributeDeclaration, and xmlpp::EntityDeclaration.

    +

    Reimplemented in xmlpp::Attribute, xmlpp::EntityDeclaration, and xmlpp::AttributeDeclaration.

    @@ -378,7 +398,7 @@ Protected Member Functions
    _xmlNode* xmlpp::Node::cobj _xmlNode* xmlpp::Node::cobj ( )
    - + @@ -389,7 +409,7 @@ Protected Member Functions

    Access the underlying libxml implementation.

    -

    Reimplemented in xmlpp::Attribute, xmlpp::AttributeDeclaration, and xmlpp::EntityDeclaration.

    +

    Reimplemented in xmlpp::Attribute, xmlpp::EntityDeclaration, and xmlpp::AttributeDeclaration.

    @@ -398,7 +418,7 @@ Protected Member Functions
    const _xmlNode* xmlpp::Node::cobj const _xmlNode* xmlpp::Node::cobj ( ) const
    - + @@ -427,7 +447,7 @@ Protected Member Functions
    _xmlNode* xmlpp::Node::create_new_child_node _xmlNode* xmlpp::Node::create_new_child_node ( const Glib::ustring name,
    - + @@ -448,7 +468,7 @@ Protected Member Functions
    static void xmlpp::Node::create_wrapper static void xmlpp::Node::create_wrapper ( _xmlNode *  node)
    - + @@ -459,13 +479,13 @@ Protected Member Functions

    Find nodes from a XPath expression.

    -
    Parameters:
    +
    Parameters:
    NodeSet xmlpp::Node::find NodeSet xmlpp::Node::find ( const Glib::ustring xpath)
    xpathThe XPath of the nodes.
    -
    Exceptions:
    +
    Exceptions:
    exception
    @@ -479,7 +499,7 @@ Protected Member Functions
    - + @@ -500,14 +520,14 @@ Protected Member Functions

    Find nodes from a XPath expression.

    -
    Parameters:
    +
    Parameters:
    NodeSet xmlpp::Node::find NodeSet xmlpp::Node::find ( const Glib::ustring xpath,
    xpathThe XPath of the nodes.
    namespacesA map of namespace prefixes to namespace URIs to be used while finding.
    -
    Exceptions:
    +
    Exceptions:
    exception
    @@ -521,7 +541,7 @@ Protected Member Functions
    - + @@ -541,7 +561,7 @@ Protected Member Functions
    static void xmlpp::Node::free_wrappers static void xmlpp::Node::free_wrappers ( _xmlNode *  attr)
    - + @@ -553,7 +573,7 @@ Protected Member Functions

    Obtain the list of child nodes.

    You may optionally obtain a list of only the child nodes which have a certain name.

    -
    Parameters:
    +
    Parameters:
    NodeList xmlpp::Node::get_children NodeList xmlpp::Node::get_children ( const Glib::ustring name = Glib::ustring())
    nameThe names of the child nodes to get. If you do not specigy a name, then the list will contain all nodes, regardless of their names.
    @@ -568,7 +588,7 @@ Protected Member Functions
    - + @@ -580,7 +600,7 @@ Protected Member Functions

    Obtain the list of child nodes.

    You may optionally obtain a list of only the child nodes which have a certain name.

    -
    Parameters:
    +
    Parameters:
    const NodeList xmlpp::Node::get_children const NodeList xmlpp::Node::get_children ( const Glib::ustring name = Glib::ustring())
    nameThe names of the child nodes to get. If you do not specigy a name, then the list will contain all nodes, regardless of their names.
    @@ -590,12 +610,56 @@ Protected Member Functions
    + +
    +
    + + + + + + + + +
    const Node* xmlpp::Node::get_first_child (const Glib::ustringname = Glib::ustring()) const
    +
    +
    + +

    Get the first child of this node.

    +

    You may optionally get the first child node which has a certain name.

    +
    Returns:
    The first child
    +
    Since libxml++ 2.36:
    + +
    +
    + +
    +
    + + + + + + + + +
    Node* xmlpp::Node::get_first_child (const Glib::ustringname = Glib::ustring())
    +
    +
    + +

    Get the first child of this node.

    +

    You may optionally get the first child node which has a certain name.

    +
    Returns:
    The first child
    +
    Since libxml++ 2.36:
    + +
    +
    - + @@ -614,7 +678,7 @@ Protected Member Functions
    int xmlpp::Node::get_line int xmlpp::Node::get_line ( ) const
    - + @@ -635,7 +699,7 @@ Protected Member Functions
    Glib::ustring xmlpp::Node::get_name Glib::ustring xmlpp::Node::get_name ( ) const
    - + @@ -651,7 +715,7 @@ Protected Member Functions
    Glib::ustring xmlpp::Node::get_namespace_prefix Glib::ustring xmlpp::Node::get_namespace_prefix ( ) const
    - + @@ -667,7 +731,7 @@ Protected Member Functions
    Glib::ustring xmlpp::Node::get_namespace_uri Glib::ustring xmlpp::Node::get_namespace_uri ( ) const
    - + @@ -686,7 +750,7 @@ Protected Member Functions
    const Node* xmlpp::Node::get_next_sibling const Node* xmlpp::Node::get_next_sibling ( ) const
    - + @@ -700,15 +764,15 @@ Protected Member Functions - +
    Node* xmlpp::Node::get_next_sibling Node* xmlpp::Node::get_next_sibling ( )
    - + - +
    Element* xmlpp::Node::get_parent const Element* xmlpp::Node::get_parent ( ) const
    @@ -719,15 +783,15 @@ Protected Member Functions
    - +
    - + - +
    const Element* xmlpp::Node::get_parent Element* xmlpp::Node::get_parent ( ) const
    @@ -743,7 +807,7 @@ Protected Member Functions
    - + @@ -757,40 +821,40 @@ Protected Member Functions - +
    Glib::ustring xmlpp::Node::get_path Glib::ustring xmlpp::Node::get_path ( ) const
    - + - +
    Node* xmlpp::Node::get_previous_sibling const Node* xmlpp::Node::get_previous_sibling ( ) const
    -

    Get the previous sibling for this node.

    +

    Get the previous sibling for this node .

    Returns:
    The previous sibling
    - +
    - + - +
    const Node* xmlpp::Node::get_previous_sibling Node* xmlpp::Node::get_previous_sibling ( ) const
    -

    Get the previous sibling for this node .

    +

    Get the previous sibling for this node.

    Returns:
    The previous sibling
    @@ -800,7 +864,7 @@ Protected Member Functions
    - + @@ -821,7 +885,7 @@ Protected Member Functions

    Import node(s) from another document under this node, without affecting the source node.

    -
    Parameters:
    +
    Parameters:
    Node* xmlpp::Node::import_node Node* xmlpp::Node::import_node ( const Node node,
    @@ -829,7 +893,7 @@ Protected Member Functions
    Returns:
    The newly-created node.
    -
    Exceptions:
    +
    Exceptions:
    nodeThe node to copy and insert under the current node.
    recursiveWhether to import the child nodes also. Defaults to true.
    exception
    @@ -843,7 +907,7 @@ Protected Member Functions
    - + @@ -854,7 +918,7 @@ Protected Member Functions

    Remove the child node.

    -
    Parameters:
    +
    Parameters:
    void xmlpp::Node::remove_child void xmlpp::Node::remove_child ( Node node)
    nodeThe child node to remove. This Node will be deleted and therefore unusable after calling this method.
    @@ -868,7 +932,7 @@ Protected Member Functions
    - + @@ -879,7 +943,7 @@ Protected Member Functions

    Set the name of this node.

    -
    Parameters:
    +
    Parameters:
    void xmlpp::Node::set_name void xmlpp::Node::set_name ( const Glib::ustring name)
    nameThe new name for the node.
    @@ -893,7 +957,7 @@ Protected Member Functions
    - + @@ -905,13 +969,13 @@ Protected Member Functions

    Set the namespace prefix used by the node.

    If no such namespace prefix has been declared then this method will throw an exception.

    -
    Parameters:
    +
    Parameters:
    void xmlpp::Node::set_namespace void xmlpp::Node::set_namespace ( const Glib::ustring ns_prefix)
    ns_prefixThe namespace prefix.
    -
    Exceptions:
    +
    Exceptions:
    exception
    @@ -923,9 +987,14 @@ Protected Member Functions
    The documentation for this class was generated from the following file:
    • nodes/node.h
    -
    - +
    + + + + diff --git a/docs/reference/html/classxmlpp_1_1Node__coll__graph.png b/docs/reference/html/classxmlpp_1_1Node__coll__graph.png index 0f63a78..1e7d184 100644 Binary files a/docs/reference/html/classxmlpp_1_1Node__coll__graph.png and b/docs/reference/html/classxmlpp_1_1Node__coll__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1Node__inherit__graph.png b/docs/reference/html/classxmlpp_1_1Node__inherit__graph.png index 8b68232..5a64c64 100644 Binary files a/docs/reference/html/classxmlpp_1_1Node__inherit__graph.png and b/docs/reference/html/classxmlpp_1_1Node__inherit__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1NonCopyable-members.html b/docs/reference/html/classxmlpp_1_1NonCopyable-members.html index e20d8ce..9050f31 100644 --- a/docs/reference/html/classxmlpp_1_1NonCopyable-members.html +++ b/docs/reference/html/classxmlpp_1_1NonCopyable-members.html @@ -2,24 +2,40 @@ + libxml++: Member List + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    This is the complete list of members for xmlpp::NonCopyable, including all inherited members. -
    NonCopyable()xmlpp::NonCopyable [protected]
    ~NonCopyable()xmlpp::NonCopyable [protected, virtual]
    - +
    + + + + diff --git a/docs/reference/html/classxmlpp_1_1NonCopyable.html b/docs/reference/html/classxmlpp_1_1NonCopyable.html index 7fb4e57..17e7eb5 100644 --- a/docs/reference/html/classxmlpp_1_1NonCopyable.html +++ b/docs/reference/html/classxmlpp_1_1NonCopyable.html @@ -2,24 +2,40 @@ + libxml++: xmlpp::NonCopyable Class Reference + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    xmlpp::NonCopyable Class Reference
    -
    +

    Herited by classes which cannot be copied. More...

    @@ -59,7 +75,7 @@ Inheritance diagram for xmlpp::NonCopyable:
    Inheritance graph
    - +
    [legend]

    List of all members.

    @@ -77,7 +93,7 @@ Protected Member Functions
    - + @@ -93,7 +109,7 @@ Protected Member Functions
    xmlpp::NonCopyable::NonCopyable xmlpp::NonCopyable::NonCopyable ( ) [protected]
    - + @@ -107,9 +123,14 @@ Protected Member Functions
    The documentation for this class was generated from the following file:
    • noncopyable.h
    - - + + + + + diff --git a/docs/reference/html/classxmlpp_1_1NonCopyable__inherit__graph.png b/docs/reference/html/classxmlpp_1_1NonCopyable__inherit__graph.png index fc4754f..6454b29 100644 Binary files a/docs/reference/html/classxmlpp_1_1NonCopyable__inherit__graph.png and b/docs/reference/html/classxmlpp_1_1NonCopyable__inherit__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1OStreamOutputBuffer-members.html b/docs/reference/html/classxmlpp_1_1OStreamOutputBuffer-members.html index dc4f116..1046583 100644 --- a/docs/reference/html/classxmlpp_1_1OStreamOutputBuffer-members.html +++ b/docs/reference/html/classxmlpp_1_1OStreamOutputBuffer-members.html @@ -2,24 +2,40 @@ +libxml++: Member List + - + + + + - -
    +
    + +
    virtual xmlpp::NonCopyable::~NonCopyable virtual xmlpp::NonCopyable::~NonCopyable ( ) [protected, virtual]
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    This is the complete list of members for xmlpp::OStreamOutputBuffer, including all inherited members. @@ -57,9 +73,14 @@ This is the complete list of members for -
    cobj()xmlpp::OutputBuffer
    ~NonCopyable()xmlpp::NonCopyable [protected, virtual]
    ~OStreamOutputBuffer()xmlpp::OStreamOutputBuffer [virtual]
    ~OutputBuffer()xmlpp::OutputBuffer [virtual]
    - +
    + + + + diff --git a/docs/reference/html/classxmlpp_1_1OStreamOutputBuffer.html b/docs/reference/html/classxmlpp_1_1OStreamOutputBuffer.html index 6f4467b..b153e80 100644 --- a/docs/reference/html/classxmlpp_1_1OStreamOutputBuffer.html +++ b/docs/reference/html/classxmlpp_1_1OStreamOutputBuffer.html @@ -2,24 +2,40 @@ + libxml++: xmlpp::OStreamOutputBuffer Class Reference + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    xmlpp::OStreamOutputBuffer Class Reference
    -
    +

    An OutputBuffer implementation that send datas to a std::ostream. More...

    @@ -59,14 +75,14 @@ Inheritance diagram for xmlpp::OStreamOutputBuffer:
    Inheritance graph
    - +
    [legend]
    Collaboration diagram for xmlpp::OStreamOutputBuffer:
    Collaboration graph
    - +
    [legend]

    List of all members.

    @@ -84,7 +100,7 @@ Public Member Functions
    - + @@ -103,7 +119,7 @@ Public Member Functions
    xmlpp::OStreamOutputBuffer::OStreamOutputBuffer xmlpp::OStreamOutputBuffer::OStreamOutputBuffer ( std::ostream &  output,
    -
    Parameters:
    +
    Parameters:
    @@ -118,7 +134,7 @@ Public Member Functions
    outputThe ostream datas will be send to
    encodingCharset in which data will be encoded before being sent to the stream
    - + @@ -132,9 +148,14 @@ Public Member Functions
    The documentation for this class was generated from the following file:
    • io/ostreamoutputbuffer.h
    - - + + + + + diff --git a/docs/reference/html/classxmlpp_1_1OStreamOutputBuffer__coll__graph.png b/docs/reference/html/classxmlpp_1_1OStreamOutputBuffer__coll__graph.png index 1506eaa..de85709 100644 Binary files a/docs/reference/html/classxmlpp_1_1OStreamOutputBuffer__coll__graph.png and b/docs/reference/html/classxmlpp_1_1OStreamOutputBuffer__coll__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1OStreamOutputBuffer__inherit__graph.png b/docs/reference/html/classxmlpp_1_1OStreamOutputBuffer__inherit__graph.png index 1506eaa..de85709 100644 Binary files a/docs/reference/html/classxmlpp_1_1OStreamOutputBuffer__inherit__graph.png and b/docs/reference/html/classxmlpp_1_1OStreamOutputBuffer__inherit__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1OutputBuffer-members.html b/docs/reference/html/classxmlpp_1_1OutputBuffer-members.html index 7c997d7..19a260d 100644 --- a/docs/reference/html/classxmlpp_1_1OutputBuffer-members.html +++ b/docs/reference/html/classxmlpp_1_1OutputBuffer-members.html @@ -2,24 +2,40 @@ +libxml++: Member List + - + + + + - -
    +
    + +
    virtual xmlpp::OStreamOutputBuffer::~OStreamOutputBuffer virtual xmlpp::OStreamOutputBuffer::~OStreamOutputBuffer ( ) [virtual]
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    This is the complete list of members for xmlpp::OutputBuffer, including all inherited members. @@ -55,9 +71,14 @@ This is the complete list of members for -
    cobj()xmlpp::OutputBuffer
    OutputBuffer(const Glib::ustring& encoding=Glib::ustring())xmlpp::OutputBuffer
    ~NonCopyable()xmlpp::NonCopyable [protected, virtual]
    ~OutputBuffer()xmlpp::OutputBuffer [virtual]
    - +
    + + + + diff --git a/docs/reference/html/classxmlpp_1_1OutputBuffer.html b/docs/reference/html/classxmlpp_1_1OutputBuffer.html index 98e35f7..a09a46a 100644 --- a/docs/reference/html/classxmlpp_1_1OutputBuffer.html +++ b/docs/reference/html/classxmlpp_1_1OutputBuffer.html @@ -2,24 +2,40 @@ + libxml++: xmlpp::OutputBuffer Class Reference + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    xmlpp::OutputBuffer Class Reference
    -
    +

    Base class for xmlOutputBuffer wrapper. More...

    @@ -59,14 +75,14 @@ Inheritance diagram for xmlpp::OutputBuffer:
    Inheritance graph
    - +
    [legend]
    Collaboration diagram for xmlpp::OutputBuffer:
    Collaboration graph
    - +
    [legend]

    List of all members.

    @@ -89,7 +105,7 @@ Public Member Functions
    - + @@ -98,7 +114,7 @@ Public Member Functions
    xmlpp::OutputBuffer::OutputBuffer xmlpp::OutputBuffer::OutputBuffer ( const Glib::ustring encoding = Glib::ustring())
    -
    Parameters:
    +
    Parameters:
    encodingThe encoding herited class wait for in do_write. If not provided, UTF-8 will be sent to do_write.
    @@ -113,7 +129,7 @@ Public Member Functions
    - + @@ -130,7 +146,7 @@ Public Member Functions
    virtual xmlpp::OutputBuffer::~OutputBuffer virtual xmlpp::OutputBuffer::~OutputBuffer ( ) [virtual]
    - + @@ -148,7 +164,7 @@ Public Member Functions
    _xmlOutputBuffer* xmlpp::OutputBuffer::cobj _xmlOutputBuffer* xmlpp::OutputBuffer::cobj ( )
    - + @@ -164,9 +180,14 @@ Public Member Functions
    The documentation for this class was generated from the following file:
    • io/outputbuffer.h
    - - + + + + + diff --git a/docs/reference/html/classxmlpp_1_1OutputBuffer__coll__graph.png b/docs/reference/html/classxmlpp_1_1OutputBuffer__coll__graph.png index ddcfc55..4964fb4 100644 Binary files a/docs/reference/html/classxmlpp_1_1OutputBuffer__coll__graph.png and b/docs/reference/html/classxmlpp_1_1OutputBuffer__coll__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1OutputBuffer__inherit__graph.png b/docs/reference/html/classxmlpp_1_1OutputBuffer__inherit__graph.png index d5c1bdc..5966739 100644 Binary files a/docs/reference/html/classxmlpp_1_1OutputBuffer__inherit__graph.png and b/docs/reference/html/classxmlpp_1_1OutputBuffer__inherit__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1Parser-members.html b/docs/reference/html/classxmlpp_1_1Parser-members.html index da45968..c189a09 100644 --- a/docs/reference/html/classxmlpp_1_1Parser-members.html +++ b/docs/reference/html/classxmlpp_1_1Parser-members.html @@ -2,24 +2,40 @@ +libxml++: Member List + - + + + + - -
    +
    + +
    const _xmlOutputBuffer* xmlpp::OutputBuffer::cobj const _xmlOutputBuffer* xmlpp::OutputBuffer::cobj ( ) const
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    This is the complete list of members for xmlpp::Parser, including all inherited members. @@ -86,9 +102,14 @@ This is the complete list of members for -
    callback_error_or_warning(MsgType msg_type, void* ctx, const char* msg, va_list var_args)xmlpp::Parser [protected, static]
    validate_warning_xmlpp::Parser [protected]
    ~NonCopyable()xmlpp::NonCopyable [private, virtual]
    ~Parser()xmlpp::Parser [virtual]
    - +
    + + + + diff --git a/docs/reference/html/classxmlpp_1_1Parser.html b/docs/reference/html/classxmlpp_1_1Parser.html index b8ef3a5..a6be098 100644 --- a/docs/reference/html/classxmlpp_1_1Parser.html +++ b/docs/reference/html/classxmlpp_1_1Parser.html @@ -2,24 +2,40 @@ + libxml++: xmlpp::Parser Class Reference + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    xmlpp::Parser Class Reference
    -
    +

    XML parser. More...

    @@ -64,14 +80,14 @@ Inheritance diagram for xmlpp::Parser:
    Inheritance graph
    - +
    [legend]
    Collaboration diagram for xmlpp::Parser:
    Collaboration graph
    - +
    [legend]

    List of all members.

    @@ -183,7 +199,7 @@ Protected Attributes
    - + @@ -199,7 +215,7 @@ Protected Attributes
    xmlpp::Parser::Parser xmlpp::Parser::Parser ( )
    - + @@ -216,7 +232,7 @@ Protected Attributes
    virtual xmlpp::Parser::~Parser virtual xmlpp::Parser::~Parser ( ) [virtual]
    - + @@ -255,7 +271,7 @@ Protected Attributes
    static void xmlpp::Parser::callback_error_or_warning static void xmlpp::Parser::callback_error_or_warning ( MsgType  msg_type,
    - + @@ -288,7 +304,7 @@ Protected Attributes
    static void xmlpp::Parser::callback_parser_error static void xmlpp::Parser::callback_parser_error ( void *  ctx,
    - + @@ -321,7 +337,7 @@ Protected Attributes
    static void xmlpp::Parser::callback_parser_warning static void xmlpp::Parser::callback_parser_warning ( void *  ctx,
    - + @@ -354,7 +370,7 @@ Protected Attributes
    static void xmlpp::Parser::callback_validity_error static void xmlpp::Parser::callback_validity_error ( void *  ctx,
    - + @@ -387,7 +403,7 @@ Protected Attributes
    static void xmlpp::Parser::callback_validity_warning static void xmlpp::Parser::callback_validity_warning ( void *  ctx,
    - + @@ -403,7 +419,7 @@ Protected Attributes
    virtual void xmlpp::Parser::check_for_exception virtual void xmlpp::Parser::check_for_exception ( ) [protected, virtual]
    - + @@ -419,7 +435,7 @@ Protected Attributes
    virtual void xmlpp::Parser::check_for_validity_messages virtual void xmlpp::Parser::check_for_validity_messages ( ) [protected, virtual]
    - + @@ -438,7 +454,7 @@ Protected Attributes
    virtual bool xmlpp::Parser::get_substitute_entities virtual bool xmlpp::Parser::get_substitute_entities ( ) const [virtual]
    - + @@ -448,7 +464,7 @@ Protected Attributes

    See set_throw_messages().

    -
    Since libxml++ 2.36:
    +
    Since libxml++ 2.36:
    Returns:
    Whether messages will be collected and thrown in an exception. The default with only validation messages thrown is returned as false.
    @@ -458,7 +474,7 @@ Protected Attributes
    bool xmlpp::Parser::get_throw_messages bool xmlpp::Parser::get_throw_messages ( ) const
    - + @@ -477,7 +493,7 @@ Protected Attributes
    virtual bool xmlpp::Parser::get_validate virtual bool xmlpp::Parser::get_validate ( ) const [virtual]
    - + @@ -494,7 +510,7 @@ Protected Attributes
    virtual void xmlpp::Parser::handleException virtual void xmlpp::Parser::handleException ( const exception e)
    - + @@ -510,7 +526,7 @@ Protected Attributes
    virtual void xmlpp::Parser::initialize_context virtual void xmlpp::Parser::initialize_context ( ) [protected, virtual]
    - + @@ -527,7 +543,7 @@ Protected Attributes
    virtual void xmlpp::Parser::on_validity_error virtual void xmlpp::Parser::on_validity_error ( const Glib::ustring message)
    - + @@ -544,7 +560,7 @@ Protected Attributes
    virtual void xmlpp::Parser::on_validity_warning virtual void xmlpp::Parser::on_validity_warning ( const Glib::ustring message)
    - + @@ -555,13 +571,13 @@ Protected Attributes

    Parse an XML document from a file.

    -
    Exceptions:
    +
    Exceptions:
    virtual void xmlpp::Parser::parse_file virtual void xmlpp::Parser::parse_file ( const Glib::ustring filename)
    exception
    -
    Parameters:
    +
    Parameters:
    filenameThe path to the file.
    @@ -577,7 +593,7 @@ Protected Attributes
    - + @@ -588,13 +604,13 @@ Protected Attributes

    Parse an XML document from a string.

    -
    Exceptions:
    +
    Exceptions:
    virtual void xmlpp::Parser::parse_memory virtual void xmlpp::Parser::parse_memory ( const Glib::ustring contents)
    exception
    -
    Parameters:
    +
    Parameters:
    contentsThe XML document as a string.
    @@ -610,7 +626,7 @@ Protected Attributes
    - + @@ -621,13 +637,13 @@ Protected Attributes

    Parse an XML document from a stream.

    -
    Exceptions:
    +
    Exceptions:
    virtual void xmlpp::Parser::parse_stream virtual void xmlpp::Parser::parse_stream ( std::istream &  in)
    exception
    -
    Parameters:
    +
    Parameters:
    inThe stream.
    @@ -643,7 +659,7 @@ Protected Attributes
    - + @@ -661,7 +677,7 @@ Protected Attributes
    virtual void xmlpp::Parser::release_underlying virtual void xmlpp::Parser::release_underlying ( ) [protected, virtual]
    - + @@ -673,7 +689,7 @@ Protected Attributes

    Set whether the parser will automatically substitute entity references with the text of the entities' definitions.

    For instance, this affects the text returned by ContentNode::get_content(). By default, the parser will not substitute entities, so that you do not lose the entity reference information.

    -
    Parameters:
    +
    Parameters:
    virtual void xmlpp::Parser::set_substitute_entities virtual void xmlpp::Parser::set_substitute_entities ( bool  val = true)
    valWhether entities will be substitued.
    @@ -687,7 +703,7 @@ Protected Attributes
    - + @@ -700,8 +716,8 @@ Protected Attributes

    Set whether the parser will collect and throw error and warning messages.

    If messages are collected, they are included in an exception thrown at the end of parsing. If the messages are not collected, they are written on stderr. The messages written on stderr are slightly different, and may be preferred in a program started from the command-line.

    The default, if set_throw_messages() is not called, is to collect and throw only messages from validation. Other messages are written to stderr. This is for backward compatibility, and may change in the future.

    -
    Since libxml++ 2.36:
    -
    Parameters:
    +
    Since libxml++ 2.36:
    +
    Parameters:
    void xmlpp::Parser::set_throw_messages void xmlpp::Parser::set_throw_messages ( bool  val = true)
    valWhether messages will be collected and thrown in an exception.
    @@ -715,7 +731,7 @@ Protected Attributes
    - + @@ -726,7 +742,7 @@ Protected Attributes

    By default, the parser will not validate the XML file.

    -
    Parameters:
    +
    Parameters:
    virtual void xmlpp::Parser::set_validate virtual void xmlpp::Parser::set_validate ( bool  val = true)
    valWhether the document should be validated.
    @@ -817,9 +833,14 @@ Protected Attributes
    The documentation for this class was generated from the following file:
    • parsers/parser.h
    -
    - +
    + + + + diff --git a/docs/reference/html/classxmlpp_1_1ParserInputBuffer-members.html b/docs/reference/html/classxmlpp_1_1ParserInputBuffer-members.html index f61fb49..1b49614 100644 --- a/docs/reference/html/classxmlpp_1_1ParserInputBuffer-members.html +++ b/docs/reference/html/classxmlpp_1_1ParserInputBuffer-members.html @@ -2,24 +2,40 @@ + libxml++: Member List + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    This is the complete list of members for xmlpp::ParserInputBuffer, including all inherited members. @@ -55,9 +71,14 @@ This is the complete list of members for -
    cobj()xmlpp::ParserInputBuffer
    ParserInputBuffer()xmlpp::ParserInputBuffer
    ~NonCopyable()xmlpp::NonCopyable [protected, virtual]
    ~ParserInputBuffer()xmlpp::ParserInputBuffer [virtual]
    - +
    + + + + diff --git a/docs/reference/html/classxmlpp_1_1ParserInputBuffer.html b/docs/reference/html/classxmlpp_1_1ParserInputBuffer.html index cf29f1d..da9ce7b 100644 --- a/docs/reference/html/classxmlpp_1_1ParserInputBuffer.html +++ b/docs/reference/html/classxmlpp_1_1ParserInputBuffer.html @@ -2,24 +2,40 @@ + libxml++: xmlpp::ParserInputBuffer Class Reference + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    xmlpp::ParserInputBuffer Class Reference
    -
    +

    Base class for xmlParserInputBuffer wrapper. More...

    @@ -59,14 +75,14 @@ Inheritance diagram for xmlpp::ParserInputBuffer:
    Inheritance graph
    - +
    [legend]
    Collaboration diagram for xmlpp::ParserInputBuffer:
    Collaboration graph
    - +
    [legend]

    List of all members.

    @@ -89,7 +105,7 @@ Public Member Functions
    - + @@ -105,7 +121,7 @@ Public Member Functions
    xmlpp::ParserInputBuffer::ParserInputBuffer xmlpp::ParserInputBuffer::ParserInputBuffer ( )
    - + @@ -122,7 +138,7 @@ Public Member Functions
    virtual xmlpp::ParserInputBuffer::~ParserInputBuffer virtual xmlpp::ParserInputBuffer::~ParserInputBuffer ( ) [virtual]
    - + @@ -140,7 +156,7 @@ Public Member Functions
    _xmlParserInputBuffer* xmlpp::ParserInputBuffer::cobj _xmlParserInputBuffer* xmlpp::ParserInputBuffer::cobj ( )
    - + @@ -156,9 +172,14 @@ Public Member Functions
    The documentation for this class was generated from the following file:
    • io/parserinputbuffer.h
    - - + + + + + diff --git a/docs/reference/html/classxmlpp_1_1ParserInputBuffer__coll__graph.png b/docs/reference/html/classxmlpp_1_1ParserInputBuffer__coll__graph.png index 39197df..f33e92a 100644 Binary files a/docs/reference/html/classxmlpp_1_1ParserInputBuffer__coll__graph.png and b/docs/reference/html/classxmlpp_1_1ParserInputBuffer__coll__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1ParserInputBuffer__inherit__graph.png b/docs/reference/html/classxmlpp_1_1ParserInputBuffer__inherit__graph.png index 25200e2..4a23b4f 100644 Binary files a/docs/reference/html/classxmlpp_1_1ParserInputBuffer__inherit__graph.png and b/docs/reference/html/classxmlpp_1_1ParserInputBuffer__inherit__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1Parser__coll__graph.png b/docs/reference/html/classxmlpp_1_1Parser__coll__graph.png index b281c37..f46a890 100644 Binary files a/docs/reference/html/classxmlpp_1_1Parser__coll__graph.png and b/docs/reference/html/classxmlpp_1_1Parser__coll__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1Parser__inherit__graph.png b/docs/reference/html/classxmlpp_1_1Parser__inherit__graph.png index 4d75bc5..300c9ad 100644 Binary files a/docs/reference/html/classxmlpp_1_1Parser__inherit__graph.png and b/docs/reference/html/classxmlpp_1_1Parser__inherit__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1ProcessingInstructionNode-members.html b/docs/reference/html/classxmlpp_1_1ProcessingInstructionNode-members.html index e556c14..0a67107 100644 --- a/docs/reference/html/classxmlpp_1_1ProcessingInstructionNode-members.html +++ b/docs/reference/html/classxmlpp_1_1ProcessingInstructionNode-members.html @@ -2,24 +2,40 @@ +libxml++: Member List + - + + + + - -
    +
    + +
    const _xmlParserInputBuffer* xmlpp::ParserInputBuffer::cobj const _xmlParserInputBuffer* xmlpp::ParserInputBuffer::cobj ( ) const
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    This is the complete list of members for xmlpp::ProcessingInstructionNode, including all inherited members. @@ -63,6 +79,8 @@ This is the complete list of members for + + @@ -89,9 +107,14 @@ This is the complete list of members for -
    add_child(const Glib::ustring& name, const Glib::ustring& ns_prefix=Glib::ustring())xmlpp::Node
    get_children(const Glib::ustring& name=Glib::ustring())xmlpp::Node
    get_children(const Glib::ustring& name=Glib::ustring()) const xmlpp::Node
    get_content() const xmlpp::ContentNode
    get_first_child(const Glib::ustring& name=Glib::ustring()) const xmlpp::Node
    get_first_child(const Glib::ustring& name=Glib::ustring())xmlpp::Node
    get_line() const xmlpp::Node
    get_name() const xmlpp::Node
    get_namespace_prefix() const xmlpp::Node
    ~Node()xmlpp::Node [virtual]
    ~NonCopyable()xmlpp::NonCopyable [protected, virtual]
    ~ProcessingInstructionNode()xmlpp::ProcessingInstructionNode [virtual]
    - +
    + + + + diff --git a/docs/reference/html/classxmlpp_1_1ProcessingInstructionNode.html b/docs/reference/html/classxmlpp_1_1ProcessingInstructionNode.html index 7014aa8..e1d1d0a 100644 --- a/docs/reference/html/classxmlpp_1_1ProcessingInstructionNode.html +++ b/docs/reference/html/classxmlpp_1_1ProcessingInstructionNode.html @@ -2,24 +2,40 @@ + libxml++: xmlpp::ProcessingInstructionNode Class Reference + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    xmlpp::ProcessingInstructionNode Class Reference
    -
    +

    #include <libxml++/nodes/processinginstructionnode.h>

    @@ -57,14 +73,14 @@ Inheritance diagram for xmlpp::ProcessingInstructionNode:
    Inheritance graph
    - +
    [legend]
    Collaboration diagram for xmlpp::ProcessingInstructionNode:
    Collaboration graph
    - +
    [legend]

    List of all members.

    @@ -80,7 +96,7 @@ Public Member Functions
    - + @@ -97,7 +113,7 @@ Public Member Functions
    xmlpp::ProcessingInstructionNode::ProcessingInstructionNode xmlpp::ProcessingInstructionNode::ProcessingInstructionNode ( _xmlNode *  node)
    - + @@ -111,9 +127,14 @@ Public Member Functions
    The documentation for this class was generated from the following file:
    • nodes/processinginstructionnode.h
    - - + + + + + diff --git a/docs/reference/html/classxmlpp_1_1ProcessingInstructionNode__coll__graph.png b/docs/reference/html/classxmlpp_1_1ProcessingInstructionNode__coll__graph.png index c668fb1..facabdd 100644 Binary files a/docs/reference/html/classxmlpp_1_1ProcessingInstructionNode__coll__graph.png and b/docs/reference/html/classxmlpp_1_1ProcessingInstructionNode__coll__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1ProcessingInstructionNode__inherit__graph.png b/docs/reference/html/classxmlpp_1_1ProcessingInstructionNode__inherit__graph.png index c668fb1..facabdd 100644 Binary files a/docs/reference/html/classxmlpp_1_1ProcessingInstructionNode__inherit__graph.png and b/docs/reference/html/classxmlpp_1_1ProcessingInstructionNode__inherit__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1SaxParser-members.html b/docs/reference/html/classxmlpp_1_1SaxParser-members.html index 6e32d85..664c988 100644 --- a/docs/reference/html/classxmlpp_1_1SaxParser-members.html +++ b/docs/reference/html/classxmlpp_1_1SaxParser-members.html @@ -2,24 +2,40 @@ +libxml++: Member List + - + + + + - -
    +
    + +
    virtual xmlpp::ProcessingInstructionNode::~ProcessingInstructionNode virtual xmlpp::ProcessingInstructionNode::~ProcessingInstructionNode ( ) [virtual]
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    This is the complete list of members for xmlpp::SaxParser, including all inherited members. @@ -104,9 +120,14 @@ This is the complete list of members for -
    AttributeList typedefxmlpp::SaxParser
    validate_warning_xmlpp::Parser [protected]
    ~Parser()xmlpp::Parser [virtual]
    ~SaxParser()xmlpp::SaxParser [virtual]
    - +
    + + + + diff --git a/docs/reference/html/classxmlpp_1_1SaxParser.html b/docs/reference/html/classxmlpp_1_1SaxParser.html index 9d9ec05..44636f9 100644 --- a/docs/reference/html/classxmlpp_1_1SaxParser.html +++ b/docs/reference/html/classxmlpp_1_1SaxParser.html @@ -2,24 +2,40 @@ + libxml++: xmlpp::SaxParser Class Reference + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    xmlpp::SaxParser Class Reference
    -
    +

    SAX XML parser. More...

    @@ -62,14 +78,14 @@ Inheritance diagram for xmlpp::SaxParser:
    Inheritance graph
    - +
    [legend]
    Collaboration diagram for xmlpp::SaxParser:
    Collaboration graph
    - +
    [legend]

    List of all members.

    @@ -144,7 +160,7 @@ Protected Member Functions
    - + @@ -153,7 +169,7 @@ Protected Member Functions
    xmlpp::SaxParser::SaxParser xmlpp::SaxParser::SaxParser ( bool  use_get_entity = false)
    -
    Parameters:
    +
    Parameters:
    use_get_entitySet this to true if you will override on_get_entity(). In theory, if you do not override on_get_entity() the parser should behave exactly the same whether you use true or false here. But the default implementation of on_get_entity(), needed if you override on_get_entity() might not have the same behaviour as the underlying default behaviour of libxml, so the libxml implementation is the default here.
    @@ -167,7 +183,7 @@ Protected Member Functions
    - + @@ -184,7 +200,7 @@ Protected Member Functions
    virtual xmlpp::SaxParser::~SaxParser virtual xmlpp::SaxParser::~SaxParser ( ) [virtual]
    - + @@ -203,7 +219,7 @@ Protected Member Functions
    virtual void xmlpp::SaxParser::finish_chunk_parsing virtual void xmlpp::SaxParser::finish_chunk_parsing ( ) [virtual]
    - + @@ -220,7 +236,7 @@ Protected Member Functions
    virtual void xmlpp::SaxParser::on_cdata_block virtual void xmlpp::SaxParser::on_cdata_block ( const Glib::ustring text)
    - + @@ -237,7 +253,7 @@ Protected Member Functions
    virtual void xmlpp::SaxParser::on_characters virtual void xmlpp::SaxParser::on_characters ( const Glib::ustring characters)
    - + @@ -254,7 +270,7 @@ Protected Member Functions
    virtual void xmlpp::SaxParser::on_comment virtual void xmlpp::SaxParser::on_comment ( const Glib::ustring text)
    - + @@ -270,7 +286,7 @@ Protected Member Functions
    virtual void xmlpp::SaxParser::on_end_document virtual void xmlpp::SaxParser::on_end_document ( ) [protected, virtual]
    - + @@ -287,7 +303,7 @@ Protected Member Functions
    virtual void xmlpp::SaxParser::on_end_element virtual void xmlpp::SaxParser::on_end_element ( const Glib::ustring name)
    - + @@ -336,7 +352,7 @@ Protected Member Functions
    virtual void xmlpp::SaxParser::on_entity_declaration virtual void xmlpp::SaxParser::on_entity_declaration ( const Glib::ustring name,
    - + @@ -353,7 +369,7 @@ Protected Member Functions
    virtual void xmlpp::SaxParser::on_error virtual void xmlpp::SaxParser::on_error ( const Glib::ustring text)
    - + @@ -370,7 +386,7 @@ Protected Member Functions
    virtual void xmlpp::SaxParser::on_fatal_error virtual void xmlpp::SaxParser::on_fatal_error ( const Glib::ustring text)
    - + @@ -385,7 +401,7 @@ Protected Member Functions

    This is known to be difficult, because it requires both an understanding of the W3C specifications and knowledge of the libxml internals. Entity resolution is easier with the DomParser.

    Call this method in this base class for default processing. For instance, if you just want to know about the existence of an entity reference, without affecting the normal substitution, just override and call the base class.

    Unlike the DomParser, the SaxParser will also tell you about entity references for the 5 predefined entities.

    -
    Parameters:
    +
    Parameters:
    virtual _xmlEntity* xmlpp::SaxParser::on_get_entity virtual _xmlEntity* xmlpp::SaxParser::on_get_entity ( const Glib::ustring name)
    nameThe entity reference name.
    @@ -400,7 +416,7 @@ Protected Member Functions
    - + @@ -435,7 +451,7 @@ Protected Member Functions
    virtual void xmlpp::SaxParser::on_internal_subset virtual void xmlpp::SaxParser::on_internal_subset ( const Glib::ustring name,
    - + @@ -451,7 +467,7 @@ Protected Member Functions
    virtual void xmlpp::SaxParser::on_start_document virtual void xmlpp::SaxParser::on_start_document ( ) [protected, virtual]
    - + @@ -478,7 +494,7 @@ Protected Member Functions
    virtual void xmlpp::SaxParser::on_start_element virtual void xmlpp::SaxParser::on_start_element ( const Glib::ustring name,
    - + @@ -495,7 +511,7 @@ Protected Member Functions
    virtual void xmlpp::SaxParser::on_warning virtual void xmlpp::SaxParser::on_warning ( const Glib::ustring text)
    - + @@ -508,13 +524,13 @@ Protected Member Functions

    Parse a chunk of data.

    This lets you pass a document in small chunks, e.g. from a network connection. The on_* virtual functions are called each time the chunks provide enough information to advance the parser.

    The first call to parse_chunk will setup the parser. When the last chunk has been parsed, call finish_chunk_parsing() to finish the parse.

    -
    Exceptions:
    +
    Exceptions:
    virtual void xmlpp::SaxParser::parse_chunk virtual void xmlpp::SaxParser::parse_chunk ( const Glib::ustring chunk)
    exception
    -
    Parameters:
    +
    Parameters:
    chunkThe next piece of the XML document.
    @@ -528,7 +544,7 @@ Protected Member Functions
    - + @@ -552,13 +568,13 @@ Protected Member Functions
    Since libxml++ 2.24:

    This lets you pass a document in small chunks, e.g. from a network connection. The on_* virtual functions are called each time the chunks provide enough information to advance the parser.

    The first call to parse_chunk will setup the parser. When the last chunk has been parsed, call finish_chunk_parsing() to finish the parse.

    -
    Exceptions:
    +
    Exceptions:
    void xmlpp::SaxParser::parse_chunk_raw void xmlpp::SaxParser::parse_chunk_raw ( const unsigned char *  contents,
    exception
    -
    Parameters:
    +
    Parameters:
    @@ -573,7 +589,7 @@ Protected Member Functions
    contentsThe next piece of the XML document as an array of bytes.
    bytes_countThe number of bytes in the contents array.
    - + @@ -584,13 +600,13 @@ Protected Member Functions

    Parse an XML document from a file.

    -
    Exceptions:
    +
    Exceptions:
    virtual void xmlpp::SaxParser::parse_file virtual void xmlpp::SaxParser::parse_file ( const Glib::ustring filename)
    exception
    -
    Parameters:
    +
    Parameters:
    filenameThe path to the file.
    @@ -606,7 +622,7 @@ Protected Member Functions
    - + @@ -617,13 +633,13 @@ Protected Member Functions

    Parse an XML document from a string.

    -
    Exceptions:
    +
    Exceptions:
    virtual void xmlpp::SaxParser::parse_memory virtual void xmlpp::SaxParser::parse_memory ( const Glib::ustring contents)
    exception
    -
    Parameters:
    +
    Parameters:
    contentsThe XML document as a string.
    @@ -639,7 +655,7 @@ Protected Member Functions
    - + @@ -660,13 +676,13 @@ Protected Member Functions

    Parse an XML document from raw memory.

    -
    Exceptions:
    +
    Exceptions:
    void xmlpp::SaxParser::parse_memory_raw void xmlpp::SaxParser::parse_memory_raw ( const unsigned char *  contents,
    exception
    -
    Parameters:
    +
    Parameters:
    @@ -681,7 +697,7 @@ Protected Member Functions
    contentsThe XML document as an array of bytes.
    bytes_countThe number of bytes in the contents array.
    - + @@ -692,13 +708,13 @@ Protected Member Functions

    Parse an XML document from a stream.

    -
    Exceptions:
    +
    Exceptions:
    virtual void xmlpp::SaxParser::parse_stream virtual void xmlpp::SaxParser::parse_stream ( std::istream &  in)
    exception
    -
    Parameters:
    +
    Parameters:
    inThe stream.
    @@ -714,7 +730,7 @@ Protected Member Functions
    - + @@ -730,9 +746,14 @@ Protected Member Functions
    The documentation for this class was generated from the following file:
    • parsers/saxparser.h
    - - + + + + + diff --git a/docs/reference/html/classxmlpp_1_1SaxParser__coll__graph.png b/docs/reference/html/classxmlpp_1_1SaxParser__coll__graph.png index af57b64..15cb8be 100644 Binary files a/docs/reference/html/classxmlpp_1_1SaxParser__coll__graph.png and b/docs/reference/html/classxmlpp_1_1SaxParser__coll__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1SaxParser__inherit__graph.png b/docs/reference/html/classxmlpp_1_1SaxParser__inherit__graph.png index ad5ef33..9e34268 100644 Binary files a/docs/reference/html/classxmlpp_1_1SaxParser__inherit__graph.png and b/docs/reference/html/classxmlpp_1_1SaxParser__inherit__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1Schema-members.html b/docs/reference/html/classxmlpp_1_1Schema-members.html index 76100d3..5d3e813 100644 --- a/docs/reference/html/classxmlpp_1_1Schema-members.html +++ b/docs/reference/html/classxmlpp_1_1Schema-members.html @@ -2,24 +2,40 @@ +libxml++: Member List + - + + + + - -
    +
    + +
    virtual void xmlpp::SaxParser::release_underlying virtual void xmlpp::SaxParser::release_underlying ( ) [protected, virtual]
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    This is the complete list of members for xmlpp::Schema, including all inherited members. @@ -63,9 +79,14 @@ This is the complete list of members for -
    cobj()xmlpp::Schema
    set_document(Document* document=0, bool embed=false)xmlpp::Schema [virtual]
    ~NonCopyable()xmlpp::NonCopyable [private, virtual]
    ~Schema()xmlpp::Schema
    - +
    + + + + diff --git a/docs/reference/html/classxmlpp_1_1Schema.html b/docs/reference/html/classxmlpp_1_1Schema.html index 8f99c46..a406002 100644 --- a/docs/reference/html/classxmlpp_1_1Schema.html +++ b/docs/reference/html/classxmlpp_1_1Schema.html @@ -2,24 +2,40 @@ + libxml++: xmlpp::Schema Class Reference + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    xmlpp::Schema Class Reference
    -
    +

    Represents an XML Schema. More...

    @@ -60,14 +76,14 @@ Inheritance diagram for xmlpp::Schema:
    Inheritance graph
    - +
    [legend]
    Collaboration diagram for xmlpp::Schema:
    Collaboration graph
    - +
    [legend]

    List of all members.

    @@ -103,7 +119,7 @@ Protected Member Functions
    - + @@ -122,7 +138,7 @@ Protected Member Functions
    xmlpp::Schema::Schema xmlpp::Schema::Schema ( _xmlSchema *  schema)
    - + @@ -143,7 +159,7 @@ Protected Member Functions

    Create a schema from a XML document.

    -
    Parameters:
    +
    Parameters:
    xmlpp::Schema::Schema xmlpp::Schema::Schema ( Document document = 0,
    @@ -158,7 +174,7 @@ Protected Member Functions
    documentXMLSchema document, 0 to create an empty schema document.
    embedIf true, the document will be deleted when the schema is deleted or another document is set.
    - + @@ -175,7 +191,7 @@ Protected Member Functions
    xmlpp::Schema::~Schema xmlpp::Schema::~Schema ( )
    - + @@ -193,7 +209,7 @@ Protected Member Functions
    _xmlSchema* xmlpp::Schema::cobj _xmlSchema* xmlpp::Schema::cobj ( )
    - + @@ -211,7 +227,7 @@ Protected Member Functions
    const _xmlSchema* xmlpp::Schema::cobj const _xmlSchema* xmlpp::Schema::cobj ( ) const
    - + @@ -227,7 +243,7 @@ Protected Member Functions
    Document* xmlpp::Schema::get_document Document* xmlpp::Schema::get_document ( )
    - + @@ -243,7 +259,7 @@ Protected Member Functions
    const Document* xmlpp::Schema::get_document const Document* xmlpp::Schema::get_document ( ) const
    - + @@ -259,7 +275,7 @@ Protected Member Functions
    Glib::ustring xmlpp::Schema::get_name Glib::ustring xmlpp::Schema::get_name ( ) const
    - + @@ -275,7 +291,7 @@ Protected Member Functions
    Glib::ustring xmlpp::Schema::get_target_namespace Glib::ustring xmlpp::Schema::get_target_namespace ( ) const
    - + @@ -291,7 +307,7 @@ Protected Member Functions
    Glib::ustring xmlpp::Schema::get_version Glib::ustring xmlpp::Schema::get_version ( ) const
    - + @@ -307,7 +323,7 @@ Protected Member Functions
    virtual void xmlpp::Schema::release_underlying virtual void xmlpp::Schema::release_underlying ( ) [protected, virtual]
    - + @@ -328,7 +344,7 @@ Protected Member Functions

    Set a new document to the schema.

    -
    Parameters:
    +
    Parameters:
    virtual void xmlpp::Schema::set_document virtual void xmlpp::Schema::set_document ( Document document = 0,
    @@ -341,9 +357,14 @@ Protected Member Functions
    The documentation for this class was generated from the following file:
    • schema.h
    - - + + + + + diff --git a/docs/reference/html/classxmlpp_1_1SchemaValidator-members.html b/docs/reference/html/classxmlpp_1_1SchemaValidator-members.html index 2f2bd49..efada98 100644 --- a/docs/reference/html/classxmlpp_1_1SchemaValidator-members.html +++ b/docs/reference/html/classxmlpp_1_1SchemaValidator-members.html @@ -2,24 +2,40 @@ +libxml++: Member List + - + + + + - -
    +
    + +
    documentXMLSchema document, 0 to create an empty schema document.
    embedIf true, the document will be deleted when the schema is deleted or another document is set.
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    This is the complete list of members for xmlpp::SchemaValidator, including all inherited members. @@ -82,9 +98,14 @@ This is the complete list of members for -
    callback_validity_error(void* ctx, const char* msg,...)xmlpp::Validator [protected, static]
    Validator()xmlpp::Validator
    ~SchemaValidator()xmlpp::SchemaValidator [virtual]
    ~Validator()xmlpp::Validator [virtual]
    - +
    + + + + diff --git a/docs/reference/html/classxmlpp_1_1SchemaValidator.html b/docs/reference/html/classxmlpp_1_1SchemaValidator.html index c407da8..1506c1a 100644 --- a/docs/reference/html/classxmlpp_1_1SchemaValidator.html +++ b/docs/reference/html/classxmlpp_1_1SchemaValidator.html @@ -2,24 +2,40 @@ + libxml++: xmlpp::SchemaValidator Class Reference + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    xmlpp::SchemaValidator Class Reference
    -
    +

    Schema Validator. More...

    @@ -61,14 +77,14 @@ Inheritance diagram for xmlpp::SchemaValidator:
    Inheritance graph
    - +
    [legend]
    Collaboration diagram for xmlpp::SchemaValidator:
    Collaboration graph
    - +
    [legend]

    List of all members.

    @@ -110,7 +126,7 @@ Protected Attributes
    - + @@ -126,7 +142,7 @@ Protected Attributes
    xmlpp::SchemaValidator::SchemaValidator xmlpp::SchemaValidator::SchemaValidator ( )
    - + @@ -143,7 +159,7 @@ Protected Attributes
    xmlpp::SchemaValidator::SchemaValidator xmlpp::SchemaValidator::SchemaValidator ( const Glib::ustring file)
    - + @@ -160,7 +176,7 @@ Protected Attributes
    xmlpp::SchemaValidator::SchemaValidator xmlpp::SchemaValidator::SchemaValidator ( Document document)
    - + @@ -177,7 +193,7 @@ Protected Attributes
    xmlpp::SchemaValidator::SchemaValidator xmlpp::SchemaValidator::SchemaValidator ( Schema schema)
    - + @@ -194,7 +210,7 @@ Protected Attributes
    virtual xmlpp::SchemaValidator::~SchemaValidator virtual xmlpp::SchemaValidator::~SchemaValidator ( ) [virtual]
    - + @@ -210,7 +226,7 @@ Protected Attributes
    Schema* xmlpp::SchemaValidator::get_schema Schema* xmlpp::SchemaValidator::get_schema ( )
    - + @@ -226,7 +242,7 @@ Protected Attributes
    const Schema* xmlpp::SchemaValidator::get_schema const Schema* xmlpp::SchemaValidator::get_schema ( ) const
    - + @@ -262,7 +278,7 @@ Protected Attributes
    virtual void xmlpp::SchemaValidator::initialize_valid virtual void xmlpp::SchemaValidator::initialize_valid ( ) [protected, virtual]
    - + @@ -279,7 +295,7 @@ Protected Attributes
    void xmlpp::SchemaValidator::parse_context void xmlpp::SchemaValidator::parse_context ( _xmlSchemaParserCtxt *  context)
    - + @@ -296,7 +312,7 @@ Protected Attributes
    virtual void xmlpp::SchemaValidator::parse_document virtual void xmlpp::SchemaValidator::parse_document ( Document document)
    - + @@ -313,7 +329,7 @@ Protected Attributes
    virtual void xmlpp::SchemaValidator::parse_file virtual void xmlpp::SchemaValidator::parse_file ( const Glib::ustring filename)
    - + @@ -330,7 +346,7 @@ Protected Attributes
    virtual void xmlpp::SchemaValidator::parse_memory virtual void xmlpp::SchemaValidator::parse_memory ( const Glib::ustring contents)
    - + @@ -348,7 +364,7 @@ Protected Attributes
    virtual void xmlpp::SchemaValidator::release_underlying virtual void xmlpp::SchemaValidator::release_underlying ( ) [protected, virtual]
    - + @@ -360,15 +376,15 @@ Protected Attributes - +
    virtual void xmlpp::SchemaValidator::set_schema virtual void xmlpp::SchemaValidator::set_schema ( Schema schema)
    - + - - + +
    bool xmlpp::SchemaValidator::validate bool xmlpp::SchemaValidator::validate (const Glib::ustringfile)const Documentdoc)
    @@ -377,15 +393,15 @@ Protected Attributes
    - +
    - + - - + +
    bool xmlpp::SchemaValidator::validate bool xmlpp::SchemaValidator::validate (const Documentdoc)const Glib::ustringfile)
    @@ -437,9 +453,14 @@ Protected Attributes
    The documentation for this class was generated from the following file:
    • validators/schemavalidator.h
    -
    - +
    + + + + diff --git a/docs/reference/html/classxmlpp_1_1SchemaValidator__coll__graph.png b/docs/reference/html/classxmlpp_1_1SchemaValidator__coll__graph.png index fc3f314..0f737f3 100644 Binary files a/docs/reference/html/classxmlpp_1_1SchemaValidator__coll__graph.png and b/docs/reference/html/classxmlpp_1_1SchemaValidator__coll__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1SchemaValidator__inherit__graph.png b/docs/reference/html/classxmlpp_1_1SchemaValidator__inherit__graph.png index 8ec42eb..046bbdb 100644 Binary files a/docs/reference/html/classxmlpp_1_1SchemaValidator__inherit__graph.png and b/docs/reference/html/classxmlpp_1_1SchemaValidator__inherit__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1Schema__coll__graph.png b/docs/reference/html/classxmlpp_1_1Schema__coll__graph.png index f1fdfe4..5cbb1ad 100644 Binary files a/docs/reference/html/classxmlpp_1_1Schema__coll__graph.png and b/docs/reference/html/classxmlpp_1_1Schema__coll__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1Schema__inherit__graph.png b/docs/reference/html/classxmlpp_1_1Schema__inherit__graph.png index f1fdfe4..5cbb1ad 100644 Binary files a/docs/reference/html/classxmlpp_1_1Schema__inherit__graph.png and b/docs/reference/html/classxmlpp_1_1Schema__inherit__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1TextNode-members.html b/docs/reference/html/classxmlpp_1_1TextNode-members.html index 210f16d..40843a8 100644 --- a/docs/reference/html/classxmlpp_1_1TextNode-members.html +++ b/docs/reference/html/classxmlpp_1_1TextNode-members.html @@ -2,24 +2,40 @@ + libxml++: Member List + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    This is the complete list of members for xmlpp::TextNode, including all inherited members. @@ -63,6 +79,8 @@ This is the complete list of members for + + @@ -89,9 +107,14 @@ This is the complete list of members for -
    add_child(const Glib::ustring& name, const Glib::ustring& ns_prefix=Glib::ustring())xmlpp::Node
    get_children(const Glib::ustring& name=Glib::ustring())xmlpp::Node
    get_children(const Glib::ustring& name=Glib::ustring()) const xmlpp::Node
    get_content() const xmlpp::ContentNode
    get_first_child(const Glib::ustring& name=Glib::ustring()) const xmlpp::Node
    get_first_child(const Glib::ustring& name=Glib::ustring())xmlpp::Node
    get_line() const xmlpp::Node
    get_name() const xmlpp::Node
    get_namespace_prefix() const xmlpp::Node
    ~Node()xmlpp::Node [virtual]
    ~NonCopyable()xmlpp::NonCopyable [protected, virtual]
    ~TextNode()xmlpp::TextNode [virtual]
    - +
    + + + + diff --git a/docs/reference/html/classxmlpp_1_1TextNode.html b/docs/reference/html/classxmlpp_1_1TextNode.html index 094b996..2ac0119 100644 --- a/docs/reference/html/classxmlpp_1_1TextNode.html +++ b/docs/reference/html/classxmlpp_1_1TextNode.html @@ -2,24 +2,40 @@ + libxml++: xmlpp::TextNode Class Reference + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    xmlpp::TextNode Class Reference
    -
    +

    Text Node. More...

    @@ -59,14 +75,14 @@ Inheritance diagram for xmlpp::TextNode:
    Inheritance graph
    - +
    [legend]
    Collaboration diagram for xmlpp::TextNode:
    Collaboration graph
    - +
    [legend]

    List of all members.

    @@ -85,7 +101,7 @@ Public Member Functions
    - + @@ -102,7 +118,7 @@ Public Member Functions
    xmlpp::TextNode::TextNode xmlpp::TextNode::TextNode ( _xmlNode *  node)
    - + @@ -116,9 +132,14 @@ Public Member Functions
    The documentation for this class was generated from the following file:
    • nodes/textnode.h
    - - + + + + + diff --git a/docs/reference/html/classxmlpp_1_1TextNode__coll__graph.png b/docs/reference/html/classxmlpp_1_1TextNode__coll__graph.png index 1b31fd0..1fae351 100644 Binary files a/docs/reference/html/classxmlpp_1_1TextNode__coll__graph.png and b/docs/reference/html/classxmlpp_1_1TextNode__coll__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1TextNode__inherit__graph.png b/docs/reference/html/classxmlpp_1_1TextNode__inherit__graph.png index 1b31fd0..1fae351 100644 Binary files a/docs/reference/html/classxmlpp_1_1TextNode__inherit__graph.png and b/docs/reference/html/classxmlpp_1_1TextNode__inherit__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1TextReader-members.html b/docs/reference/html/classxmlpp_1_1TextReader-members.html index 9f6b4b4..3525ee4 100644 --- a/docs/reference/html/classxmlpp_1_1TextReader-members.html +++ b/docs/reference/html/classxmlpp_1_1TextReader-members.html @@ -2,24 +2,40 @@ +libxml++: Member List + - + + + + - -
    +
    + +
    virtual xmlpp::TextNode::~TextNode virtual xmlpp::TextNode::~TextNode ( ) [virtual]
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    This is the complete list of members for xmlpp::TextReader, including all inherited members. @@ -128,9 +144,14 @@ This is the complete list of members for -
    Attribute enum valuexmlpp::TextReader
    xmlReadState enum namexmlpp::TextReader
    ~NonCopyable()xmlpp::NonCopyable [private, virtual]
    ~TextReader()xmlpp::TextReader
    - +
    + + + + diff --git a/docs/reference/html/classxmlpp_1_1TextReader.html b/docs/reference/html/classxmlpp_1_1TextReader.html index cbeec7d..3fa22a2 100644 --- a/docs/reference/html/classxmlpp_1_1TextReader.html +++ b/docs/reference/html/classxmlpp_1_1TextReader.html @@ -2,24 +2,40 @@ + libxml++: xmlpp::TextReader Class Reference + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    xmlpp::TextReader Class Reference
    -
    +

    A TextReader-style XML parser A reader that provides fast, non-cached, forward-only access to XML data, in the style of .Net's XmlTextReader class. More...

    @@ -60,14 +76,14 @@ Inheritance diagram for xmlpp::TextReader:
    Inheritance graph
    - +
    [legend]
    Collaboration diagram for xmlpp::TextReader:
    Collaboration graph
    - +
    [legend]

    List of all members.

    @@ -305,7 +321,7 @@ Public Member Functions
    - + @@ -317,7 +333,7 @@ Public Member Functions

    Wraps a TextReader object from an underlying libxml object.

    The TextReader takes ownership of cobj.

    -
    Parameters:
    +
    Parameters:
    xmlpp::TextReader::TextReader xmlpp::TextReader::TextReader ( struct _xmlTextReader *  cobj)
    cobjThe underlying libxml xmlTextReader object.
    @@ -331,7 +347,7 @@ Public Member Functions
    - + @@ -342,7 +358,7 @@ Public Member Functions

    Creates a new TextReader object to parse a file or URI.

    -
    Parameters:
    +
    Parameters:
    xmlpp::TextReader::TextReader xmlpp::TextReader::TextReader ( const Glib::ustring URI)
    URIThe URI to read.
    @@ -356,7 +372,7 @@ Public Member Functions
    - + @@ -383,7 +399,7 @@ Public Member Functions

    Creates a new TextReader object which parses in memory data.

    -
    Parameters:
    +
    Parameters:
    xmlpp::TextReader::TextReader xmlpp::TextReader::TextReader ( const unsigned char *  data,
    @@ -399,7 +415,7 @@ Public Member Functions
    dataThe data to parse.
    sizeThe number of bytes in data.
    - + @@ -416,7 +432,7 @@ Public Member Functions
    xmlpp::TextReader::~TextReader xmlpp::TextReader::~TextReader ( )
    - + @@ -432,7 +448,7 @@ Public Member Functions
    void xmlpp::TextReader::close void xmlpp::TextReader::close ( )
    - + @@ -448,7 +464,7 @@ Public Member Functions
    Node* xmlpp::TextReader::expand Node* xmlpp::TextReader::expand ( )
    - + @@ -465,7 +481,7 @@ Public Member Functions
    Glib::ustring xmlpp::TextReader::get_attribute Glib::ustring xmlpp::TextReader::get_attribute ( int  number)
    - + @@ -482,7 +498,7 @@ Public Member Functions
    Glib::ustring xmlpp::TextReader::get_attribute Glib::ustring xmlpp::TextReader::get_attribute ( const Glib::ustring name)
    - + @@ -509,7 +525,7 @@ Public Member Functions
    Glib::ustring xmlpp::TextReader::get_attribute Glib::ustring xmlpp::TextReader::get_attribute ( const Glib::ustring local_name,
    - + @@ -528,7 +544,7 @@ Public Member Functions
    int xmlpp::TextReader::get_attribute_count int xmlpp::TextReader::get_attribute_count ( ) const
    - + @@ -547,7 +563,7 @@ Public Member Functions
    Glib::ustring xmlpp::TextReader::get_base_uri Glib::ustring xmlpp::TextReader::get_base_uri ( ) const
    - + @@ -563,7 +579,7 @@ Public Member Functions
    Node* xmlpp::TextReader::get_current_node Node* xmlpp::TextReader::get_current_node ( )
    - + @@ -579,7 +595,7 @@ Public Member Functions
    const Node* xmlpp::TextReader::get_current_node const Node* xmlpp::TextReader::get_current_node ( ) const
    - + @@ -598,7 +614,7 @@ Public Member Functions
    int xmlpp::TextReader::get_depth int xmlpp::TextReader::get_depth ( ) const
    - + @@ -614,7 +630,7 @@ Public Member Functions
    Glib::ustring xmlpp::TextReader::get_local_name Glib::ustring xmlpp::TextReader::get_local_name ( ) const
    - + @@ -630,7 +646,7 @@ Public Member Functions
    Glib::ustring xmlpp::TextReader::get_name Glib::ustring xmlpp::TextReader::get_name ( ) const
    - + @@ -646,7 +662,7 @@ Public Member Functions
    Glib::ustring xmlpp::TextReader::get_namespace_uri Glib::ustring xmlpp::TextReader::get_namespace_uri ( ) const
    - + @@ -662,7 +678,7 @@ Public Member Functions
    xmlNodeType xmlpp::TextReader::get_node_type xmlNodeType xmlpp::TextReader::get_node_type ( ) const
    - + @@ -678,7 +694,7 @@ Public Member Functions
    bool xmlpp::TextReader::get_normalization bool xmlpp::TextReader::get_normalization ( ) const
    - + @@ -695,7 +711,7 @@ Public Member Functions
    bool xmlpp::TextReader::get_parser_property bool xmlpp::TextReader::get_parser_property ( ParserProperties  property)
    - + @@ -711,7 +727,7 @@ Public Member Functions
    Glib::ustring xmlpp::TextReader::get_prefix Glib::ustring xmlpp::TextReader::get_prefix ( ) const
    - + @@ -727,7 +743,7 @@ Public Member Functions
    char xmlpp::TextReader::get_quote_char char xmlpp::TextReader::get_quote_char ( ) const
    - + @@ -743,7 +759,7 @@ Public Member Functions
    xmlReadState xmlpp::TextReader::get_read_state xmlReadState xmlpp::TextReader::get_read_state ( ) const
    - + @@ -759,7 +775,7 @@ Public Member Functions
    Glib::ustring xmlpp::TextReader::get_value Glib::ustring xmlpp::TextReader::get_value ( ) const
    - + @@ -775,7 +791,7 @@ Public Member Functions
    Glib::ustring xmlpp::TextReader::get_xml_lang Glib::ustring xmlpp::TextReader::get_xml_lang ( ) const
    - + @@ -794,7 +810,7 @@ Public Member Functions
    bool xmlpp::TextReader::has_attributes bool xmlpp::TextReader::has_attributes ( ) const
    - + @@ -813,7 +829,7 @@ Public Member Functions
    bool xmlpp::TextReader::has_value bool xmlpp::TextReader::has_value ( ) const
    - + @@ -832,7 +848,7 @@ Public Member Functions
    bool xmlpp::TextReader::is_default bool xmlpp::TextReader::is_default ( ) const
    - + @@ -851,7 +867,7 @@ Public Member Functions
    bool xmlpp::TextReader::is_empty_element bool xmlpp::TextReader::is_empty_element ( ) const
    - + @@ -867,7 +883,7 @@ Public Member Functions
    bool xmlpp::TextReader::is_valid bool xmlpp::TextReader::is_valid ( ) const
    - + @@ -884,7 +900,7 @@ Public Member Functions
    Glib::ustring xmlpp::TextReader::lookup_namespace Glib::ustring xmlpp::TextReader::lookup_namespace ( const Glib::ustring prefix)
    - + @@ -901,7 +917,7 @@ Public Member Functions
    bool xmlpp::TextReader::move_to_attribute bool xmlpp::TextReader::move_to_attribute ( int  number)
    - + @@ -918,7 +934,7 @@ Public Member Functions
    bool xmlpp::TextReader::move_to_attribute bool xmlpp::TextReader::move_to_attribute ( const Glib::ustring name)
    - + @@ -945,7 +961,7 @@ Public Member Functions
    bool xmlpp::TextReader::move_to_attribute bool xmlpp::TextReader::move_to_attribute ( const Glib::ustring local_name,
    - + @@ -961,7 +977,7 @@ Public Member Functions
    bool xmlpp::TextReader::move_to_element bool xmlpp::TextReader::move_to_element ( )
    - + @@ -977,7 +993,7 @@ Public Member Functions
    bool xmlpp::TextReader::move_to_first_attribute bool xmlpp::TextReader::move_to_first_attribute ( )
    - + @@ -993,7 +1009,7 @@ Public Member Functions
    bool xmlpp::TextReader::move_to_next_attribute bool xmlpp::TextReader::move_to_next_attribute ( )
    - + @@ -1009,7 +1025,7 @@ Public Member Functions
    bool xmlpp::TextReader::next bool xmlpp::TextReader::next ( )
    - + @@ -1028,7 +1044,7 @@ Public Member Functions
    bool xmlpp::TextReader::read bool xmlpp::TextReader::read ( )
    - + @@ -1047,7 +1063,7 @@ Public Member Functions
    bool xmlpp::TextReader::read_attribute_value bool xmlpp::TextReader::read_attribute_value ( )
    - + @@ -1066,7 +1082,7 @@ Public Member Functions
    Glib::ustring xmlpp::TextReader::read_inner_xml Glib::ustring xmlpp::TextReader::read_inner_xml ( )
    - + @@ -1085,7 +1101,7 @@ Public Member Functions
    Glib::ustring xmlpp::TextReader::read_outer_xml Glib::ustring xmlpp::TextReader::read_outer_xml ( )
    - + @@ -1104,7 +1120,7 @@ Public Member Functions
    Glib::ustring xmlpp::TextReader::read_string Glib::ustring xmlpp::TextReader::read_string ( )
    - + @@ -1121,7 +1137,7 @@ Public Member Functions
    void xmlpp::TextReader::set_normalization void xmlpp::TextReader::set_normalization ( bool  value)
    - + @@ -1146,9 +1162,14 @@ Public Member Functions
    The documentation for this class was generated from the following file:
    • parsers/textreader.h
    - - + + + + + diff --git a/docs/reference/html/classxmlpp_1_1TextReader__coll__graph.png b/docs/reference/html/classxmlpp_1_1TextReader__coll__graph.png index 2df173b..199d601 100644 Binary files a/docs/reference/html/classxmlpp_1_1TextReader__coll__graph.png and b/docs/reference/html/classxmlpp_1_1TextReader__coll__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1TextReader__inherit__graph.png b/docs/reference/html/classxmlpp_1_1TextReader__inherit__graph.png index 9dcd1c8..199d601 100644 Binary files a/docs/reference/html/classxmlpp_1_1TextReader__inherit__graph.png and b/docs/reference/html/classxmlpp_1_1TextReader__inherit__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1Validator-members.html b/docs/reference/html/classxmlpp_1_1Validator-members.html index 55653d7..22eddb2 100644 --- a/docs/reference/html/classxmlpp_1_1Validator-members.html +++ b/docs/reference/html/classxmlpp_1_1Validator-members.html @@ -2,24 +2,40 @@ +libxml++: Member List + - + + + + - -
    +
    + +
    void xmlpp::TextReader::set_parser_property void xmlpp::TextReader::set_parser_property ( ParserProperties  property,
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    This is the complete list of members for xmlpp::Validator, including all inherited members. @@ -66,9 +82,14 @@ This is the complete list of members for -
    callback_validity_error(void* ctx, const char* msg,...)xmlpp::Validator [protected, static]
    Validator()xmlpp::Validator
    ~NonCopyable()xmlpp::NonCopyable [private, virtual]
    ~Validator()xmlpp::Validator [virtual]
    - +
    + + + + diff --git a/docs/reference/html/classxmlpp_1_1Validator.html b/docs/reference/html/classxmlpp_1_1Validator.html index 0ff9320..d332fa7 100644 --- a/docs/reference/html/classxmlpp_1_1Validator.html +++ b/docs/reference/html/classxmlpp_1_1Validator.html @@ -2,24 +2,40 @@ + libxml++: xmlpp::Validator Class Reference + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    xmlpp::Validator Class Reference
    -
    +

    XML parser. More...

    @@ -62,14 +78,14 @@ Inheritance diagram for xmlpp::Validator:
    Inheritance graph
    - +
    [legend]
    Collaboration diagram for xmlpp::Validator:
    Collaboration graph
    - +
    [legend]

    List of all members.

    @@ -106,7 +122,7 @@ Protected Attributes
    - + @@ -122,7 +138,7 @@ Protected Attributes
    xmlpp::Validator::Validator xmlpp::Validator::Validator ( )
    - + @@ -139,7 +155,7 @@ Protected Attributes
    virtual xmlpp::Validator::~Validator virtual xmlpp::Validator::~Validator ( ) [virtual]
    - + @@ -172,7 +188,7 @@ Protected Attributes
    static void xmlpp::Validator::callback_validity_error static void xmlpp::Validator::callback_validity_error ( void *  ctx,
    - + @@ -205,7 +221,7 @@ Protected Attributes
    static void xmlpp::Validator::callback_validity_warning static void xmlpp::Validator::callback_validity_warning ( void *  ctx,
    - + @@ -221,7 +237,7 @@ Protected Attributes
    virtual void xmlpp::Validator::check_for_exception virtual void xmlpp::Validator::check_for_exception ( ) [protected, virtual]
    - + @@ -237,7 +253,7 @@ Protected Attributes
    virtual void xmlpp::Validator::check_for_validity_messages virtual void xmlpp::Validator::check_for_validity_messages ( ) [protected, virtual]
    - + @@ -254,7 +270,7 @@ Protected Attributes
    virtual void xmlpp::Validator::handleException virtual void xmlpp::Validator::handleException ( const exception e)
    - + @@ -272,7 +288,7 @@ Protected Attributes
    virtual void xmlpp::Validator::initialize_valid virtual void xmlpp::Validator::initialize_valid ( ) [protected, virtual]
    - + @@ -289,7 +305,7 @@ Protected Attributes
    virtual void xmlpp::Validator::on_validity_error virtual void xmlpp::Validator::on_validity_error ( const Glib::ustring message)
    - + @@ -306,7 +322,7 @@ Protected Attributes
    virtual void xmlpp::Validator::on_validity_warning virtual void xmlpp::Validator::on_validity_warning ( const Glib::ustring message)
    - + @@ -315,7 +331,7 @@ Protected Attributes @@ -375,9 +391,14 @@ Protected Attributes
    The documentation for this class was generated from the following file:
    • validators/validator.h
    - - + + + + + diff --git a/docs/reference/html/classxmlpp_1_1Validator__coll__graph.png b/docs/reference/html/classxmlpp_1_1Validator__coll__graph.png index ab39f51..5ce21e3 100644 Binary files a/docs/reference/html/classxmlpp_1_1Validator__coll__graph.png and b/docs/reference/html/classxmlpp_1_1Validator__coll__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1Validator__inherit__graph.png b/docs/reference/html/classxmlpp_1_1Validator__inherit__graph.png index 1c7f3fb..3a6ac9f 100644 Binary files a/docs/reference/html/classxmlpp_1_1Validator__inherit__graph.png and b/docs/reference/html/classxmlpp_1_1Validator__inherit__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1exception-members.html b/docs/reference/html/classxmlpp_1_1exception-members.html index cec2174..4250982 100644 --- a/docs/reference/html/classxmlpp_1_1exception-members.html +++ b/docs/reference/html/classxmlpp_1_1exception-members.html @@ -2,24 +2,40 @@ +libxml++: Member List + - + + + + - -
    +
    + +
    virtual void xmlpp::Validator::release_underlying virtual void xmlpp::Validator::release_underlying ( ) [protected, virtual]
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    This is the complete list of members for xmlpp::exception, including all inherited members. @@ -54,9 +70,14 @@ This is the complete list of members for -
    Clone() const xmlpp::exception [virtual]
    Raise() const xmlpp::exception [virtual]
    what() const xmlpp::exception [virtual]
    ~exception()xmlpp::exception [virtual]
    - +
    + + + + diff --git a/docs/reference/html/classxmlpp_1_1exception.html b/docs/reference/html/classxmlpp_1_1exception.html index d3f409b..fb513a4 100644 --- a/docs/reference/html/classxmlpp_1_1exception.html +++ b/docs/reference/html/classxmlpp_1_1exception.html @@ -2,24 +2,40 @@ + libxml++: xmlpp::exception Class Reference + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    xmlpp::exception Class Reference
    -
    +

    Base class for all xmlpp exceptions. More...

    @@ -59,14 +75,14 @@ Inheritance diagram for xmlpp::exception:
    Inheritance graph
    - +
    [legend]
    Collaboration diagram for xmlpp::exception:
    Collaboration graph
    - +
    [legend]

    List of all members.

    @@ -87,7 +103,7 @@ Public Member Functions
    - + @@ -104,7 +120,7 @@ Public Member Functions
    xmlpp::exception::exception xmlpp::exception::exception ( const Glib::ustring message)
    - + @@ -121,7 +137,7 @@ Public Member Functions
    virtual xmlpp::exception::~exception virtual xmlpp::exception::~exception ( ) throw () [virtual]
    - + @@ -139,7 +155,7 @@ Public Member Functions
    virtual exception xmlpp::exception::Clone virtual exception xmlpp::exception::Clone ( ) const [final, virtual]
    - + @@ -157,7 +173,7 @@ Public Member Functions
    virtual void xmlpp::exception::Raise virtual void xmlpp::exception::Raise ( ) const [virtual]
    - + @@ -171,9 +187,14 @@ Public Member Functions
    The documentation for this class was generated from the following file:
    • exceptions/exception.h
    - - + + + + + diff --git a/docs/reference/html/classxmlpp_1_1exception__coll__graph.png b/docs/reference/html/classxmlpp_1_1exception__coll__graph.png index 660cb7f..c46830f 100644 Binary files a/docs/reference/html/classxmlpp_1_1exception__coll__graph.png and b/docs/reference/html/classxmlpp_1_1exception__coll__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1exception__inherit__graph.png b/docs/reference/html/classxmlpp_1_1exception__inherit__graph.png index 5ed21b5..9d3242d 100644 Binary files a/docs/reference/html/classxmlpp_1_1exception__inherit__graph.png and b/docs/reference/html/classxmlpp_1_1exception__inherit__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1internal__error-members.html b/docs/reference/html/classxmlpp_1_1internal__error-members.html index 8106c3e..1a12c2b 100644 --- a/docs/reference/html/classxmlpp_1_1internal__error-members.html +++ b/docs/reference/html/classxmlpp_1_1internal__error-members.html @@ -2,24 +2,40 @@ +libxml++: Member List + - + + + + - -
    +
    + +
    virtual const char* xmlpp::exception::what virtual const char* xmlpp::exception::what ( ) const throw () [virtual]
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    This is the complete list of members for xmlpp::internal_error, including all inherited members. @@ -56,9 +72,14 @@ This is the complete list of members for -
    Clone() const xmlpp::internal_error [virtual]
    what() const xmlpp::exception [virtual]
    ~exception()xmlpp::exception [virtual]
    ~internal_error()xmlpp::internal_error [virtual]
    - +
    + + + + diff --git a/docs/reference/html/classxmlpp_1_1internal__error.html b/docs/reference/html/classxmlpp_1_1internal__error.html index 3ae8ea3..630408b 100644 --- a/docs/reference/html/classxmlpp_1_1internal__error.html +++ b/docs/reference/html/classxmlpp_1_1internal__error.html @@ -2,24 +2,40 @@ + libxml++: xmlpp::internal_error Class Reference + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    xmlpp::internal_error Class Reference
    -
    +

    #include <libxml++/exceptions/internal_error.h>

    @@ -57,14 +73,14 @@ Inheritance diagram for xmlpp::internal_error:
    Inheritance graph
    - +
    [legend]
    Collaboration diagram for xmlpp::internal_error:
    Collaboration graph
    - +
    [legend]

    List of all members.

    @@ -82,7 +98,7 @@ Public Member Functions
    - + @@ -99,7 +115,7 @@ Public Member Functions
    xmlpp::internal_error::internal_error xmlpp::internal_error::internal_error ( const Glib::ustring message)
    - + @@ -116,7 +132,7 @@ Public Member Functions
    virtual xmlpp::internal_error::~internal_error virtual xmlpp::internal_error::~internal_error ( ) throw () [virtual]
    - + @@ -134,7 +150,7 @@ Public Member Functions
    virtual exception xmlpp::internal_error::Clone virtual exception xmlpp::internal_error::Clone ( ) const [final, virtual]
    - + @@ -150,9 +166,14 @@ Public Member Functions
    The documentation for this class was generated from the following file:
    • exceptions/internal_error.h
    - - + + + + + diff --git a/docs/reference/html/classxmlpp_1_1internal__error__coll__graph.png b/docs/reference/html/classxmlpp_1_1internal__error__coll__graph.png index 184be84..02d0225 100644 Binary files a/docs/reference/html/classxmlpp_1_1internal__error__coll__graph.png and b/docs/reference/html/classxmlpp_1_1internal__error__coll__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1internal__error__inherit__graph.png b/docs/reference/html/classxmlpp_1_1internal__error__inherit__graph.png index 4da8ff3..02d0225 100644 Binary files a/docs/reference/html/classxmlpp_1_1internal__error__inherit__graph.png and b/docs/reference/html/classxmlpp_1_1internal__error__inherit__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1parse__error-members.html b/docs/reference/html/classxmlpp_1_1parse__error-members.html index a90c502..f4a512c 100644 --- a/docs/reference/html/classxmlpp_1_1parse__error-members.html +++ b/docs/reference/html/classxmlpp_1_1parse__error-members.html @@ -2,24 +2,40 @@ +libxml++: Member List + - + + + + - -
    +
    + +
    virtual void xmlpp::internal_error::Raise virtual void xmlpp::internal_error::Raise ( ) const [virtual]
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    This is the complete list of members for xmlpp::parse_error, including all inherited members. @@ -56,9 +72,14 @@ This is the complete list of members for -
    Clone() const xmlpp::parse_error [virtual]
    what() const xmlpp::exception [virtual]
    ~exception()xmlpp::exception [virtual]
    ~parse_error()xmlpp::parse_error [virtual]
    - +
    + + + + diff --git a/docs/reference/html/classxmlpp_1_1parse__error.html b/docs/reference/html/classxmlpp_1_1parse__error.html index f78e487..a9cc018 100644 --- a/docs/reference/html/classxmlpp_1_1parse__error.html +++ b/docs/reference/html/classxmlpp_1_1parse__error.html @@ -2,24 +2,40 @@ + libxml++: xmlpp::parse_error Class Reference + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    xmlpp::parse_error Class Reference
    -
    +

    This exception will be thrown when the parser encounters an error in the XML document. More...

    @@ -59,14 +75,14 @@ Inheritance diagram for xmlpp::parse_error:
    Inheritance graph
    - +
    [legend]
    Collaboration diagram for xmlpp::parse_error:
    Collaboration graph
    - +
    [legend]

    List of all members.

    @@ -86,7 +102,7 @@ Public Member Functions
    - + @@ -103,7 +119,7 @@ Public Member Functions
    xmlpp::parse_error::parse_error xmlpp::parse_error::parse_error ( const Glib::ustring message)
    - + @@ -120,7 +136,7 @@ Public Member Functions
    virtual xmlpp::parse_error::~parse_error virtual xmlpp::parse_error::~parse_error ( ) throw () [virtual]
    - + @@ -140,7 +156,7 @@ Public Member Functions
    virtual exception* xmlpp::parse_error::Clone virtual exception* xmlpp::parse_error::Clone ( ) const [virtual]
    - + @@ -158,9 +174,14 @@ Public Member Functions
    The documentation for this class was generated from the following file:
    • exceptions/parse_error.h
    - - + + + + + diff --git a/docs/reference/html/classxmlpp_1_1parse__error__coll__graph.png b/docs/reference/html/classxmlpp_1_1parse__error__coll__graph.png index a6f2414..636030f 100644 Binary files a/docs/reference/html/classxmlpp_1_1parse__error__coll__graph.png and b/docs/reference/html/classxmlpp_1_1parse__error__coll__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1parse__error__inherit__graph.png b/docs/reference/html/classxmlpp_1_1parse__error__inherit__graph.png index d1874ba..07e629c 100644 Binary files a/docs/reference/html/classxmlpp_1_1parse__error__inherit__graph.png and b/docs/reference/html/classxmlpp_1_1parse__error__inherit__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1validity__error-members.html b/docs/reference/html/classxmlpp_1_1validity__error-members.html index 8e1352b..4e1544d 100644 --- a/docs/reference/html/classxmlpp_1_1validity__error-members.html +++ b/docs/reference/html/classxmlpp_1_1validity__error-members.html @@ -2,24 +2,40 @@ +libxml++: Member List + - + + + + - -
    +
    + +
    virtual void xmlpp::parse_error::Raise virtual void xmlpp::parse_error::Raise ( ) const [virtual]
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    This is the complete list of members for xmlpp::validity_error, including all inherited members. @@ -58,9 +74,14 @@ This is the complete list of members for -
    Clone() const xmlpp::validity_error [virtual]
    ~exception()xmlpp::exception [virtual]
    ~parse_error()xmlpp::parse_error [virtual]
    ~validity_error()xmlpp::validity_error [virtual]
    - +
    + + + + diff --git a/docs/reference/html/classxmlpp_1_1validity__error.html b/docs/reference/html/classxmlpp_1_1validity__error.html index e104316..cbbc7fb 100644 --- a/docs/reference/html/classxmlpp_1_1validity__error.html +++ b/docs/reference/html/classxmlpp_1_1validity__error.html @@ -2,24 +2,40 @@ + libxml++: xmlpp::validity_error Class Reference + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +
    xmlpp::validity_error Class Reference
    -
    +

    This exception will be thrown when the parser encounters a validity error in the XML document. More...

    @@ -59,14 +75,14 @@ Inheritance diagram for xmlpp::validity_error:
    Inheritance graph
    - +
    [legend]
    Collaboration diagram for xmlpp::validity_error:
    Collaboration graph
    - +
    [legend]

    List of all members.

    @@ -86,7 +102,7 @@ Public Member Functions
    - + @@ -103,7 +119,7 @@ Public Member Functions
    xmlpp::validity_error::validity_error xmlpp::validity_error::validity_error ( const Glib::ustring message)
    - + @@ -120,7 +136,7 @@ Public Member Functions
    virtual xmlpp::validity_error::~validity_error virtual xmlpp::validity_error::~validity_error ( ) throw () [virtual]
    - + @@ -138,7 +154,7 @@ Public Member Functions
    virtual exception* xmlpp::validity_error::Clone virtual exception* xmlpp::validity_error::Clone ( ) const [virtual]
    - + @@ -154,9 +170,14 @@ Public Member Functions
    The documentation for this class was generated from the following file:
    • exceptions/validity_error.h
    - - + + + + + diff --git a/docs/reference/html/classxmlpp_1_1validity__error__coll__graph.png b/docs/reference/html/classxmlpp_1_1validity__error__coll__graph.png index a401407..94a9242 100644 Binary files a/docs/reference/html/classxmlpp_1_1validity__error__coll__graph.png and b/docs/reference/html/classxmlpp_1_1validity__error__coll__graph.png differ diff --git a/docs/reference/html/classxmlpp_1_1validity__error__inherit__graph.png b/docs/reference/html/classxmlpp_1_1validity__error__inherit__graph.png index b88e753..94a9242 100644 Binary files a/docs/reference/html/classxmlpp_1_1validity__error__inherit__graph.png and b/docs/reference/html/classxmlpp_1_1validity__error__inherit__graph.png differ diff --git a/docs/reference/html/doxygen.css b/docs/reference/html/doxygen.css index 74445fe..cee0d06 100644 --- a/docs/reference/html/doxygen.css +++ b/docs/reference/html/doxygen.css @@ -2,7 +2,8 @@ body, table, div, p, dl { font-family: Lucida Grande, Verdana, Geneva, Arial, sans-serif; - font-size: 12px; + font-size: 13px; + line-height: 1.3; } /* @group Heading Levels */ @@ -72,8 +73,6 @@ div.qindex, div.navtab{ background-color: #EBEFF6; border: 1px solid #A3B4D7; text-align: center; - margin: 2px; - padding: 2px; } div.qindex, div.navpath { @@ -123,12 +122,12 @@ a.el { a.elRef { } -a.code { - color: #4665A2; +a.code, a.code:visited { + color: #4665A2; } -a.codeRef { - color: #4665A2; +a.codeRef, a.codeRef:visited { + color: #4665A2; } /* @end */ @@ -183,15 +182,15 @@ div.groupText { } body { - background: white; + background-color: white; color: black; margin: 0; } div.contents { margin-top: 10px; - margin-left: 10px; - margin-right: 5px; + margin-left: 8px; + margin-right: 8px; } td.indexkey { @@ -200,6 +199,8 @@ td.indexkey { border: 1px solid #C4CFE5; margin: 2px 0px 2px 0; padding: 2px 10px; + white-space: nowrap; + vertical-align: top; } td.indexvalue { @@ -414,7 +415,7 @@ table.memberdecls { margin-left: 6px; } -.memproto { +.memproto, dl.reflist dt { border-top: 1px solid #A8B8D9; border-left: 1px solid #A8B8D9; border-right: 1px solid #A8B8D9; @@ -440,7 +441,7 @@ table.memberdecls { } -.memdoc { +.memdoc, dl.reflist dd { border-bottom: 1px solid #A8B8D9; border-left: 1px solid #A8B8D9; border-right: 1px solid #A8B8D9; @@ -463,6 +464,15 @@ table.memberdecls { background-image: -webkit-gradient(linear,center top,center bottom,from(#FFFFFF), color-stop(0.6,#FFFFFF), color-stop(0.60,#FFFFFF), color-stop(0.95,#F7F8FB), to(#EEF1F7)); } +dl.reflist dt { + padding: 5px; +} + +dl.reflist dd { + margin: 0px 0px 10px 0px; + padding: 5px; +} + .paramkey { text-align: right; } @@ -622,6 +632,58 @@ table.doxtable th { text-align:left; } +table.fieldtable { + width: 100%; + margin-bottom: 10px; + border: 1px solid #A8B8D9; + border-spacing: 0px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + -moz-box-shadow: rgba(0, 0, 0, 0.15) 2px 2px 2px; + -webkit-box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.15); + box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.15); +} + +.fieldtable td, .fieldtable th { + padding: 3px 7px 2px; +} + +.fieldtable td.fieldtype, .fieldtable td.fieldname { + white-space: nowrap; + border-right: 1px solid #A8B8D9; + border-bottom: 1px solid #A8B8D9; + vertical-align: top; +} + +.fieldtable td.fielddoc { + border-bottom: 1px solid #A8B8D9; + width: 100%; +} + +.fieldtable tr:last-child td { + border-bottom: none; +} + +.fieldtable th { + background-image:url('nav_f.png'); + background-repeat:repeat-x; + background-color: #E2E8F2; + font-size: 90%; + color: #253555; + padding-bottom: 4px; + padding-top: 5px; + text-align:left; + -moz-border-radius-topleft: 4px; + -moz-border-radius-topright: 4px; + -webkit-border-top-left-radius: 4px; + -webkit-border-top-right-radius: 4px; + border-top-left-radius: 4px; + border-top-right-radius: 4px; + border-bottom: 1px solid #A8B8D9; +} + + .tabsearch { top: 0px; left: 10px; @@ -701,6 +763,7 @@ div.summary a div.ingroups { + margin-left: 5px; font-size: 8pt; padding-left: 5px; width: 50%; @@ -723,7 +786,7 @@ div.header div.headertitle { - padding: 5px 5px 5px 10px; + padding: 5px 5px 5px 7px; } dl @@ -833,3 +896,54 @@ dl.bug font-weight: bold; } +div.zoom +{ + border: 1px solid #90A5CE; +} + +dl.citelist { + margin-bottom:50px; +} + +dl.citelist dt { + color:#334975; + float:left; + font-weight:bold; + margin-right:10px; + padding:5px; +} + +dl.citelist dd { + margin:2px 0; + padding:5px 0; +} + +@media print +{ + #top { display: none; } + #side-nav { display: none; } + #nav-path { display: none; } + body { overflow:visible; } + h1, h2, h3, h4, h5, h6 { page-break-after: avoid; } + .summary { display: none; } + .memitem { page-break-inside: avoid; } + #doc-content + { + margin-left:0 !important; + height:auto !important; + width:auto !important; + overflow:inherit; + display:inline; + } + pre.fragment + { + overflow: visible; + text-wrap: unrestricted; + white-space: -moz-pre-wrap; /* Moz */ + white-space: -pre-wrap; /* Opera 4-6 */ + white-space: -o-pre-wrap; /* Opera 7 */ + white-space: pre-wrap; /* CSS3 */ + word-wrap: break-word; /* IE 5.5+ */ + } +} + diff --git a/docs/reference/html/functions.html b/docs/reference/html/functions.html index 427d66b..fdc9d83 100644 --- a/docs/reference/html/functions.html +++ b/docs/reference/html/functions.html @@ -2,24 +2,40 @@ +libxml++: Class Members + - + + + + - -
    +
    + +
    virtual void xmlpp::validity_error::Raise virtual void xmlpp::validity_error::Raise ( ) const [virtual]
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + + - +
    + + + + diff --git a/docs/reference/html/functions_0x63.html b/docs/reference/html/functions_0x63.html index 88ee04a..9f00045 100644 --- a/docs/reference/html/functions_0x63.html +++ b/docs/reference/html/functions_0x63.html @@ -2,24 +2,40 @@ + libxml++: Class Members + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + + - +
    + + + + diff --git a/docs/reference/html/functions_0x64.html b/docs/reference/html/functions_0x64.html index 44896ae..aa3e039 100644 --- a/docs/reference/html/functions_0x64.html +++ b/docs/reference/html/functions_0x64.html @@ -2,24 +2,40 @@ + libxml++: Class Members + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + + - +
    + + + + diff --git a/docs/reference/html/functions_0x65.html b/docs/reference/html/functions_0x65.html index a839913..cfad73c 100644 --- a/docs/reference/html/functions_0x65.html +++ b/docs/reference/html/functions_0x65.html @@ -2,24 +2,40 @@ + libxml++: Class Members + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + + - +
    + + + + diff --git a/docs/reference/html/functions_0x66.html b/docs/reference/html/functions_0x66.html index 971d850..8744c9a 100644 --- a/docs/reference/html/functions_0x66.html +++ b/docs/reference/html/functions_0x66.html @@ -2,24 +2,40 @@ + libxml++: Class Members + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + + - +
    + + + + diff --git a/docs/reference/html/functions_0x67.html b/docs/reference/html/functions_0x67.html index 4ea9270..09cb46b 100644 --- a/docs/reference/html/functions_0x67.html +++ b/docs/reference/html/functions_0x67.html @@ -2,24 +2,40 @@ + libxml++: Class Members + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + + - +
    + + + + diff --git a/docs/reference/html/functions_0x68.html b/docs/reference/html/functions_0x68.html index 92587a6..3ef6a40 100644 --- a/docs/reference/html/functions_0x68.html +++ b/docs/reference/html/functions_0x68.html @@ -2,24 +2,40 @@ + libxml++: Class Members + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + + - +
    + + + + diff --git a/docs/reference/html/functions_0x69.html b/docs/reference/html/functions_0x69.html index 2f82832..62bd67c 100644 --- a/docs/reference/html/functions_0x69.html +++ b/docs/reference/html/functions_0x69.html @@ -2,24 +2,40 @@ + libxml++: Class Members + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + + - +
    + + + + diff --git a/docs/reference/html/functions_0x6b.html b/docs/reference/html/functions_0x6b.html index fd8c5a7..9d0ffff 100644 --- a/docs/reference/html/functions_0x6b.html +++ b/docs/reference/html/functions_0x6b.html @@ -2,24 +2,40 @@ + libxml++: Class Members + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + + - +
    + + + + diff --git a/docs/reference/html/functions_0x6c.html b/docs/reference/html/functions_0x6c.html index e5e01b8..571c716 100644 --- a/docs/reference/html/functions_0x6c.html +++ b/docs/reference/html/functions_0x6c.html @@ -2,24 +2,40 @@ + libxml++: Class Members + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + + - +
    + + + + diff --git a/docs/reference/html/functions_0x6d.html b/docs/reference/html/functions_0x6d.html index 5da145e..0cd3932 100644 --- a/docs/reference/html/functions_0x6d.html +++ b/docs/reference/html/functions_0x6d.html @@ -2,24 +2,40 @@ + libxml++: Class Members + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + + - +
    + + + + diff --git a/docs/reference/html/functions_0x6e.html b/docs/reference/html/functions_0x6e.html index 8df1008..b441d0c 100644 --- a/docs/reference/html/functions_0x6e.html +++ b/docs/reference/html/functions_0x6e.html @@ -2,24 +2,40 @@ + libxml++: Class Members + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + + - +
    + + + + diff --git a/docs/reference/html/functions_0x6f.html b/docs/reference/html/functions_0x6f.html index e8d40bb..679cf14 100644 --- a/docs/reference/html/functions_0x6f.html +++ b/docs/reference/html/functions_0x6f.html @@ -2,24 +2,40 @@ + libxml++: Class Members + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + + - +
    + + + + diff --git a/docs/reference/html/functions_0x70.html b/docs/reference/html/functions_0x70.html index 25640d3..56f2ad9 100644 --- a/docs/reference/html/functions_0x70.html +++ b/docs/reference/html/functions_0x70.html @@ -2,24 +2,40 @@ + libxml++: Class Members + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + + - +
    + + + + diff --git a/docs/reference/html/functions_0x72.html b/docs/reference/html/functions_0x72.html index b33241a..6311f51 100644 --- a/docs/reference/html/functions_0x72.html +++ b/docs/reference/html/functions_0x72.html @@ -2,24 +2,40 @@ + libxml++: Class Members + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + + - +
    + + + + diff --git a/docs/reference/html/functions_0x73.html b/docs/reference/html/functions_0x73.html index 4b4d706..f76e4fb 100644 --- a/docs/reference/html/functions_0x73.html +++ b/docs/reference/html/functions_0x73.html @@ -2,24 +2,40 @@ + libxml++: Class Members + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + + - +
    + + + + diff --git a/docs/reference/html/functions_0x74.html b/docs/reference/html/functions_0x74.html index b3f79e0..861dfb9 100644 --- a/docs/reference/html/functions_0x74.html +++ b/docs/reference/html/functions_0x74.html @@ -2,24 +2,40 @@ + libxml++: Class Members + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + + - +
    + + + + diff --git a/docs/reference/html/functions_0x76.html b/docs/reference/html/functions_0x76.html index bcaf223..cfd423b 100644 --- a/docs/reference/html/functions_0x76.html +++ b/docs/reference/html/functions_0x76.html @@ -2,24 +2,40 @@ + libxml++: Class Members + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + + - +
    + + + + diff --git a/docs/reference/html/functions_0x77.html b/docs/reference/html/functions_0x77.html index f5972cd..453c153 100644 --- a/docs/reference/html/functions_0x77.html +++ b/docs/reference/html/functions_0x77.html @@ -2,24 +2,40 @@ + libxml++: Class Members + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + + - +
    + + + + diff --git a/docs/reference/html/functions_0x78.html b/docs/reference/html/functions_0x78.html index 2fd8f5b..4e86bfd 100644 --- a/docs/reference/html/functions_0x78.html +++ b/docs/reference/html/functions_0x78.html @@ -2,24 +2,40 @@ + libxml++: Class Members + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + + - +
    + + + + diff --git a/docs/reference/html/functions_0x7e.html b/docs/reference/html/functions_0x7e.html index 1d1f3ee..480a65e 100644 --- a/docs/reference/html/functions_0x7e.html +++ b/docs/reference/html/functions_0x7e.html @@ -2,24 +2,40 @@ + libxml++: Class Members + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + + - +
    + + + + diff --git a/docs/reference/html/functions_enum.html b/docs/reference/html/functions_enum.html index 1645122..2ac4912 100644 --- a/docs/reference/html/functions_enum.html +++ b/docs/reference/html/functions_enum.html @@ -2,24 +2,40 @@ + libxml++: Class Members - Enumerations + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + + - +
    + + + + diff --git a/docs/reference/html/functions_eval.html b/docs/reference/html/functions_eval.html index e959c9a..18a36ee 100644 --- a/docs/reference/html/functions_eval.html +++ b/docs/reference/html/functions_eval.html @@ -2,24 +2,40 @@ + libxml++: Class Members - Enumerator + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + + - +
    + + + + diff --git a/docs/reference/html/functions_func.html b/docs/reference/html/functions_func.html index 69aefd0..30a5dc3 100644 --- a/docs/reference/html/functions_func.html +++ b/docs/reference/html/functions_func.html @@ -2,24 +2,40 @@ + libxml++: Class Members - Functions + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + + - +
    + + + + diff --git a/docs/reference/html/functions_func_0x63.html b/docs/reference/html/functions_func_0x63.html index 05b2e0d..f713c49 100644 --- a/docs/reference/html/functions_func_0x63.html +++ b/docs/reference/html/functions_func_0x63.html @@ -2,24 +2,40 @@ + libxml++: Class Members - Functions + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + + - +
    + + + + diff --git a/docs/reference/html/functions_func_0x64.html b/docs/reference/html/functions_func_0x64.html index a43d613..07c877c 100644 --- a/docs/reference/html/functions_func_0x64.html +++ b/docs/reference/html/functions_func_0x64.html @@ -2,24 +2,40 @@ + libxml++: Class Members - Functions + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + + - +
    + + + + diff --git a/docs/reference/html/functions_func_0x65.html b/docs/reference/html/functions_func_0x65.html index 12de6b9..3cc314c 100644 --- a/docs/reference/html/functions_func_0x65.html +++ b/docs/reference/html/functions_func_0x65.html @@ -2,24 +2,40 @@ + libxml++: Class Members - Functions + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + + - +
    + + + + diff --git a/docs/reference/html/functions_func_0x66.html b/docs/reference/html/functions_func_0x66.html index c1cc59a..ce5ce12 100644 --- a/docs/reference/html/functions_func_0x66.html +++ b/docs/reference/html/functions_func_0x66.html @@ -2,24 +2,40 @@ + libxml++: Class Members - Functions + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + + - +
    + + + + diff --git a/docs/reference/html/functions_func_0x67.html b/docs/reference/html/functions_func_0x67.html index 8fdca4a..52837ad 100644 --- a/docs/reference/html/functions_func_0x67.html +++ b/docs/reference/html/functions_func_0x67.html @@ -2,24 +2,40 @@ + libxml++: Class Members - Functions + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + + - +
    + + + + diff --git a/docs/reference/html/functions_func_0x68.html b/docs/reference/html/functions_func_0x68.html index 24bf3cd..28dcf54 100644 --- a/docs/reference/html/functions_func_0x68.html +++ b/docs/reference/html/functions_func_0x68.html @@ -2,24 +2,40 @@ + libxml++: Class Members - Functions + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + + - +
    + + + + diff --git a/docs/reference/html/functions_func_0x69.html b/docs/reference/html/functions_func_0x69.html index 81c42e8..7170493 100644 --- a/docs/reference/html/functions_func_0x69.html +++ b/docs/reference/html/functions_func_0x69.html @@ -2,24 +2,40 @@ + libxml++: Class Members - Functions + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + + - +
    + + + + diff --git a/docs/reference/html/functions_func_0x6b.html b/docs/reference/html/functions_func_0x6b.html index 124d93e..a6de759 100644 --- a/docs/reference/html/functions_func_0x6b.html +++ b/docs/reference/html/functions_func_0x6b.html @@ -2,24 +2,40 @@ + libxml++: Class Members - Functions + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + + - +
    + + + + diff --git a/docs/reference/html/functions_func_0x6c.html b/docs/reference/html/functions_func_0x6c.html index 6c214d2..1e610fa 100644 --- a/docs/reference/html/functions_func_0x6c.html +++ b/docs/reference/html/functions_func_0x6c.html @@ -2,24 +2,40 @@ + libxml++: Class Members - Functions + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + + - +
    + + + + diff --git a/docs/reference/html/functions_func_0x6d.html b/docs/reference/html/functions_func_0x6d.html index abd218c..f0453f1 100644 --- a/docs/reference/html/functions_func_0x6d.html +++ b/docs/reference/html/functions_func_0x6d.html @@ -2,24 +2,40 @@ + libxml++: Class Members - Functions + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + + - +
    + + + + diff --git a/docs/reference/html/functions_func_0x6e.html b/docs/reference/html/functions_func_0x6e.html index a6924da..a254e36 100644 --- a/docs/reference/html/functions_func_0x6e.html +++ b/docs/reference/html/functions_func_0x6e.html @@ -2,24 +2,40 @@ + libxml++: Class Members - Functions + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + + - +
    + + + + diff --git a/docs/reference/html/functions_func_0x6f.html b/docs/reference/html/functions_func_0x6f.html index b25d473..ecd3af0 100644 --- a/docs/reference/html/functions_func_0x6f.html +++ b/docs/reference/html/functions_func_0x6f.html @@ -2,24 +2,40 @@ + libxml++: Class Members - Functions + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + + - +
    + + + + diff --git a/docs/reference/html/functions_func_0x70.html b/docs/reference/html/functions_func_0x70.html index a0eaeda..d0a497c 100644 --- a/docs/reference/html/functions_func_0x70.html +++ b/docs/reference/html/functions_func_0x70.html @@ -2,24 +2,40 @@ + libxml++: Class Members - Functions + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + + - +
    + + + + diff --git a/docs/reference/html/functions_func_0x72.html b/docs/reference/html/functions_func_0x72.html index 1476b35..aa33532 100644 --- a/docs/reference/html/functions_func_0x72.html +++ b/docs/reference/html/functions_func_0x72.html @@ -2,24 +2,40 @@ + libxml++: Class Members - Functions + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + + - +
    + + + + diff --git a/docs/reference/html/functions_func_0x73.html b/docs/reference/html/functions_func_0x73.html index dc23850..5e9ef0b 100644 --- a/docs/reference/html/functions_func_0x73.html +++ b/docs/reference/html/functions_func_0x73.html @@ -2,24 +2,40 @@ + libxml++: Class Members - Functions + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + + - +
    + + + + diff --git a/docs/reference/html/functions_func_0x74.html b/docs/reference/html/functions_func_0x74.html index fc75cc7..48a2bbd 100644 --- a/docs/reference/html/functions_func_0x74.html +++ b/docs/reference/html/functions_func_0x74.html @@ -2,24 +2,40 @@ + libxml++: Class Members - Functions + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + + - +
    + + + + diff --git a/docs/reference/html/functions_func_0x76.html b/docs/reference/html/functions_func_0x76.html index 8a92c20..a9c3b09 100644 --- a/docs/reference/html/functions_func_0x76.html +++ b/docs/reference/html/functions_func_0x76.html @@ -2,24 +2,40 @@ + libxml++: Class Members - Functions + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + + - +
    + + + + diff --git a/docs/reference/html/functions_func_0x77.html b/docs/reference/html/functions_func_0x77.html index 31d2472..1176bed 100644 --- a/docs/reference/html/functions_func_0x77.html +++ b/docs/reference/html/functions_func_0x77.html @@ -2,24 +2,40 @@ + libxml++: Class Members - Functions + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + + - +
    + + + + diff --git a/docs/reference/html/functions_func_0x7e.html b/docs/reference/html/functions_func_0x7e.html index 6368372..3f76c62 100644 --- a/docs/reference/html/functions_func_0x7e.html +++ b/docs/reference/html/functions_func_0x7e.html @@ -2,24 +2,40 @@ + libxml++: Class Members - Functions + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + + - +
    + + + + diff --git a/docs/reference/html/functions_type.html b/docs/reference/html/functions_type.html index 9c95e51..7406f18 100644 --- a/docs/reference/html/functions_type.html +++ b/docs/reference/html/functions_type.html @@ -2,24 +2,40 @@ + libxml++: Class Members - Typedefs + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + + - +
    + + + + diff --git a/docs/reference/html/functions_vars.html b/docs/reference/html/functions_vars.html index 6761365..2f7f454 100644 --- a/docs/reference/html/functions_vars.html +++ b/docs/reference/html/functions_vars.html @@ -2,24 +2,40 @@ + libxml++: Class Members - Variables + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + + - +
    + + + + diff --git a/docs/reference/html/graph_legend.html b/docs/reference/html/graph_legend.html index c872ea6..dd7ca65 100644 --- a/docs/reference/html/graph_legend.html +++ b/docs/reference/html/graph_legend.html @@ -2,24 +2,40 @@ + libxml++: Graph Legend + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +

    This page explains how to interpret the graphs that are generated by doxygen.

    Consider the following example:

    @@ -72,7 +88,7 @@ };

    This will result in the following graph:

    -graph_legend.png +

    The boxes in the above graph have the following meaning:

      @@ -98,9 +114,14 @@ A purple dashed arrow is used if a class is contained or used by another class.
    • A yellow dashed arrow denotes a relation between a template instance and the template class it was instantiated from. The arrow is labeled with the template parameters of the instance.
    -
    - +
    + + + + diff --git a/docs/reference/html/graph_legend.png b/docs/reference/html/graph_legend.png index 94f8d37..f4f5885 100644 Binary files a/docs/reference/html/graph_legend.png and b/docs/reference/html/graph_legend.png differ diff --git a/docs/reference/html/hierarchy.html b/docs/reference/html/hierarchy.html index 7b32235..e9138ab 100644 --- a/docs/reference/html/hierarchy.html +++ b/docs/reference/html/hierarchy.html @@ -2,24 +2,40 @@ + libxml++: Class Hierarchy + - + + + + - -
    +
    + +
    + + + + +
    -
    libxml++ 2.35.1
    +
    libxml++ +  2.35.2 +
    +
    + +

    Go to the graphical class hierarchy

    @@ -104,9 +120,14 @@ This inheritance list is sorted roughly, but not completely, alphabetically:xmlpp::SaxParser::Attribute
  • xmlpp::SaxParser::AttributeHasName
- - + + + + + diff --git a/docs/reference/html/index.html b/docs/reference/html/index.html index 65e38db..b4ecd0a 100644 --- a/docs/reference/html/index.html +++ b/docs/reference/html/index.html @@ -2,24 +2,40 @@ + libxml++: libxml++ Reference Manual + - + + + + - -
+
+ +
+ + + + +
-
libxml++ 2.35.1
+
libxml++ +  2.35.2 +
+
+ +

description

@@ -58,9 +74,14 @@ basics

Then use the generated LIBXMLXX_CFLAGS and LIBXMLXX_LIBS variables in the project Makefile.am files. For example:

 program_CPPFLAGS = $(LIBXMLXX_CFLAGS)
  program_LDADD = $(LIBXMLXX_LIBS)
-
- +
+ + + + diff --git a/docs/reference/html/inherit_graph_0.png b/docs/reference/html/inherit_graph_0.png index d91a10e..374f7eb 100644 Binary files a/docs/reference/html/inherit_graph_0.png and b/docs/reference/html/inherit_graph_0.png differ diff --git a/docs/reference/html/inherit_graph_1.png b/docs/reference/html/inherit_graph_1.png index 8def5df..c1abbaf 100644 Binary files a/docs/reference/html/inherit_graph_1.png and b/docs/reference/html/inherit_graph_1.png differ diff --git a/docs/reference/html/inherit_graph_2.png b/docs/reference/html/inherit_graph_2.png index f634d69..aa7f545 100644 Binary files a/docs/reference/html/inherit_graph_2.png and b/docs/reference/html/inherit_graph_2.png differ diff --git a/docs/reference/html/inherit_graph_3.png b/docs/reference/html/inherit_graph_3.png index 859f036..a710e93 100644 Binary files a/docs/reference/html/inherit_graph_3.png and b/docs/reference/html/inherit_graph_3.png differ diff --git a/docs/reference/html/inherit_graph_4.png b/docs/reference/html/inherit_graph_4.png index 8ad0252..f4f2a17 100644 Binary files a/docs/reference/html/inherit_graph_4.png and b/docs/reference/html/inherit_graph_4.png differ diff --git a/docs/reference/html/inherit_graph_5.png b/docs/reference/html/inherit_graph_5.png index 7dd9aed..a94a553 100644 Binary files a/docs/reference/html/inherit_graph_5.png and b/docs/reference/html/inherit_graph_5.png differ diff --git a/docs/reference/html/inherit_graph_6.png b/docs/reference/html/inherit_graph_6.png index e2a4438..30208bc 100644 Binary files a/docs/reference/html/inherit_graph_6.png and b/docs/reference/html/inherit_graph_6.png differ diff --git a/docs/reference/html/inherits.html b/docs/reference/html/inherits.html index 5eacd9f..be1bcb0 100644 --- a/docs/reference/html/inherits.html +++ b/docs/reference/html/inherits.html @@ -2,24 +2,40 @@ + libxml++: Class Hierarchy + - + + + + - -
+
+ +
+ + + + +
-
libxml++ 2.35.1
+
libxml++ +  2.35.2 +
+
+ +
- +
@@ -59,24 +75,29 @@
- +
- +
- +
-
- +
+ + + + diff --git a/docs/reference/html/namespacemembers.html b/docs/reference/html/namespacemembers.html index dc923e8..890793a 100644 --- a/docs/reference/html/namespacemembers.html +++ b/docs/reference/html/namespacemembers.html @@ -2,24 +2,40 @@ + libxml++: Namespace Members + - + + + + - -
+
+ +
+ + + + +
-
libxml++ 2.35.1
+
libxml++ +  2.35.2 +
+
+ + - +
+ + + + diff --git a/docs/reference/html/namespacemembers_enum.html b/docs/reference/html/namespacemembers_enum.html index 82585ae..17ab2c6 100644 --- a/docs/reference/html/namespacemembers_enum.html +++ b/docs/reference/html/namespacemembers_enum.html @@ -2,24 +2,40 @@ + libxml++: Namespace Members + - + + + + - -
+
+ +
+ + + + +
-
libxml++ 2.35.1
+
libxml++ +  2.35.2 +
+
+ + - +
+ + + + diff --git a/docs/reference/html/namespacemembers_eval.html b/docs/reference/html/namespacemembers_eval.html index f16cd52..da493e0 100644 --- a/docs/reference/html/namespacemembers_eval.html +++ b/docs/reference/html/namespacemembers_eval.html @@ -2,24 +2,40 @@ + libxml++: Namespace Members + - + + + + - -
+
+ +
+ + + + +
-
libxml++ 2.35.1
+
libxml++ +  2.35.2 +
+
+ + - +
+ + + + diff --git a/docs/reference/html/namespacemembers_func.html b/docs/reference/html/namespacemembers_func.html index 7f829aa..ffb52a7 100644 --- a/docs/reference/html/namespacemembers_func.html +++ b/docs/reference/html/namespacemembers_func.html @@ -2,24 +2,40 @@ + libxml++: Namespace Members + - + + + + - -
+
+ +
+ + + + +
-
libxml++ 2.35.1
+
libxml++ +  2.35.2 +
+
+ + - +
+ + + + diff --git a/docs/reference/html/namespacemembers_type.html b/docs/reference/html/namespacemembers_type.html index 5e9269b..cf8262a 100644 --- a/docs/reference/html/namespacemembers_type.html +++ b/docs/reference/html/namespacemembers_type.html @@ -2,24 +2,40 @@ + libxml++: Namespace Members + - + + + + - -
+
+ +
+ + + + +
-
libxml++ 2.35.1
+
libxml++ +  2.35.2 +
+
+ + - +
+ + + + diff --git a/docs/reference/html/namespaces.html b/docs/reference/html/namespaces.html index 522b379..77f024f 100644 --- a/docs/reference/html/namespaces.html +++ b/docs/reference/html/namespaces.html @@ -2,24 +2,40 @@ + libxml++: Namespace List + - + + + + - -
+
+ +
+ + + + +
-
libxml++ 2.35.1
+
libxml++ +  2.35.2 +
+
+ +
Here is a list of all namespaces with brief descriptions:
xmlpp
-
- +
+ + + + diff --git a/docs/reference/html/namespacexmlpp.html b/docs/reference/html/namespacexmlpp.html index 0ef7049..faa6a53 100644 --- a/docs/reference/html/namespacexmlpp.html +++ b/docs/reference/html/namespacexmlpp.html @@ -2,24 +2,40 @@ + libxml++: xmlpp Namespace Reference + - + + + + - -
+
+ +
+ + + + +
-
libxml++ 2.35.1
+
libxml++ +  2.35.2 +
+
+ +
xmlpp Namespace Reference
-
+

@@ -180,7 +196,7 @@ Functions

- + @@ -192,7 +208,7 @@ Functions

Format an _xmlError struct into a text string, suitable for printing.

Since libxml++ 2.36:
-
Parameters:
+
Parameters:
Glib::ustring xmlpp::format_xml_error Glib::ustring xmlpp::format_xml_error ( const _xmlError *  error = 0)
errorPointer to an _xmlError struct or 0. If 0, the error returned by xmlGetLastError() is used.
@@ -207,7 +223,7 @@ Functions
- + @@ -219,7 +235,7 @@ Functions

Format a parser error into a text string, suitable for printing.

Since libxml++ 2.36:
-
Parameters:
+
Parameters:
Glib::ustring xmlpp::format_xml_parser_error Glib::ustring xmlpp::format_xml_parser_error ( const _xmlParserCtxt *  parser_context)
parser_contextPointer to an _xmlParserCtxt struct.
@@ -229,9 +245,14 @@ Functions
-
- +
+ + + + diff --git a/docs/reference/html/pages.html b/docs/reference/html/pages.html index 0cf3577..155f60d 100644 --- a/docs/reference/html/pages.html +++ b/docs/reference/html/pages.html @@ -2,24 +2,40 @@ + libxml++: Related Pages + - + + + + - -
+
+ +
+ + + + +
-
libxml++ 2.35.1
+
libxml++ +  2.35.2 +
+
+ +
Here is a list of all related documentation pages:
-
- +
+ + + + diff --git a/docs/reference/html/since_2_20.html b/docs/reference/html/since_2_20.html index bec3bfa..3772b26 100644 --- a/docs/reference/html/since_2_20.html +++ b/docs/reference/html/since_2_20.html @@ -2,24 +2,40 @@ + libxml++: New API in libxml++ 2.20 + - + + + + - -
+
+ +
+ + + + +
-
libxml++ 2.35.1
+
libxml++ +  2.35.2 +
+
+ +
-

-
-
Member xmlpp::Element::get_attribute_value (const Glib::ustring& name, const Glib::ustring& ns_prefix=Glib::ustring()) const
+
+
Member xmlpp::Element::get_attribute_value (const Glib::ustring& name, const Glib::ustring& ns_prefix=Glib::ustring()) const
-
- +
+ + + + diff --git a/docs/reference/html/since_2_24.html b/docs/reference/html/since_2_24.html index f4a1812..9924432 100644 --- a/docs/reference/html/since_2_24.html +++ b/docs/reference/html/since_2_24.html @@ -2,24 +2,40 @@ + libxml++: New API in libxml++ 2.24 + - + + + + - -
+
+ +
+ + + + +
-
libxml++ 2.35.1
+
libxml++ +  2.35.2 +
+
+ +
-

-
-
Member xmlpp::Element::add_child_text (xmlpp::Node* previous_sibling, const Glib::ustring& content=Glib::ustring())
+
+
Member xmlpp::Element::add_child_text (xmlpp::Node* previous_sibling, const Glib::ustring& content=Glib::ustring())
-
-

-
-
Member xmlpp::Element::add_child_text_before (xmlpp::Node* next_sibling, const Glib::ustring& content=Glib::ustring())
+
Member xmlpp::Element::add_child_text_before (xmlpp::Node* next_sibling, const Glib::ustring& content=Glib::ustring())
-
-

-
-
Member xmlpp::Node::add_child (xmlpp::Node* previous_sibling, const Glib::ustring& name, const Glib::ustring& ns_prefix=Glib::ustring())
+
Member xmlpp::Node::add_child (xmlpp::Node* previous_sibling, const Glib::ustring& name, const Glib::ustring& ns_prefix=Glib::ustring())
-
-

-
-
Member xmlpp::Node::add_child_before (xmlpp::Node* next_sibling, const Glib::ustring& name, const Glib::ustring& ns_prefix=Glib::ustring())
+
Member xmlpp::Node::add_child_before (xmlpp::Node* next_sibling, const Glib::ustring& name, const Glib::ustring& ns_prefix=Glib::ustring())
-
-

-
-
Member xmlpp::SaxParser::parse_chunk_raw (const unsigned char* contents, size_type bytes_count)
+
Member xmlpp::SaxParser::parse_chunk_raw (const unsigned char* contents, size_type bytes_count)
-
-

-
-
Class xmlpp::Schema
+
Class xmlpp::Schema
-
-

-
-
Class xmlpp::SchemaValidator
+
Class xmlpp::SchemaValidator
-
- +
+ + + + diff --git a/docs/reference/html/since_2_36.html b/docs/reference/html/since_2_36.html index da9aa5c..baffb8b 100644 --- a/docs/reference/html/since_2_36.html +++ b/docs/reference/html/since_2_36.html @@ -2,24 +2,40 @@ + libxml++: New API in libxml++ 2.36 + - + + + + - -
+
+ +
+ + + + +
-
libxml++ 2.35.1
+
libxml++ +  2.35.2 +
+
+ +
-

-
-
Class xmlpp::AttributeDeclaration
+
+
Class xmlpp::AttributeDeclaration
-
-

-
-
Class xmlpp::AttributeNode
+
Class xmlpp::AttributeNode
-
-

-
-
Member xmlpp::Document::add_processing_instruction (const Glib::ustring& name, const Glib::ustring& content)
+
Member xmlpp::Document::add_processing_instruction (const Glib::ustring& name, const Glib::ustring& content)
-
-

-
-
Member xmlpp::Element::add_child_entity_reference (const Glib::ustring& name)
+
Member xmlpp::Element::add_child_entity_reference (const Glib::ustring& name)
-
-

-
-
Member xmlpp::Element::add_child_processing_instruction (const Glib::ustring& name, const Glib::ustring& content)
+
Member xmlpp::Element::add_child_processing_instruction (const Glib::ustring& name, const Glib::ustring& content)
-
-

-
-
Class xmlpp::EntityDeclaration
+
Class xmlpp::EntityDeclaration
-
-

-
-
Member xmlpp::format_xml_error (const _xmlError* error=0)
+
Member xmlpp::format_xml_error (const _xmlError* error=0)
-
-

-
-
Member xmlpp::format_xml_parser_error (const _xmlParserCtxt* parser_context)
+
Member xmlpp::format_xml_parser_error (const _xmlParserCtxt* parser_context)
-
-

-
-
Member xmlpp::Parser::get_throw_messages () const
+
Member xmlpp::Node::get_first_child (const Glib::ustring& name=Glib::ustring())
-
-

-
-
Member xmlpp::Parser::set_throw_messages (bool val=true)
+
Member xmlpp::Node::get_first_child (const Glib::ustring& name=Glib::ustring()) const
+
+
Member xmlpp::Parser::get_throw_messages () const
+
+
Member xmlpp::Parser::set_throw_messages (bool val=true)
-
- +
+ + + + diff --git a/docs/reference/html/structxmlpp_1_1SaxParser_1_1Attribute-members.html b/docs/reference/html/structxmlpp_1_1SaxParser_1_1Attribute-members.html index 1345bb6..893fd2f 100644 --- a/docs/reference/html/structxmlpp_1_1SaxParser_1_1Attribute-members.html +++ b/docs/reference/html/structxmlpp_1_1SaxParser_1_1Attribute-members.html @@ -2,24 +2,40 @@ + libxml++: Member List + - + + + + - -
+
+ +
+ + + + +
-
libxml++ 2.35.1
+
libxml++ +  2.35.2 +
+
+ +
This is the complete list of members for xmlpp::SaxParser::Attribute, including all inherited members. -
Attribute(Glib::ustring const& n, Glib::ustring const& v)xmlpp::SaxParser::Attribute [inline]
namexmlpp::SaxParser::Attribute
valuexmlpp::SaxParser::Attribute
- +
+ + + + diff --git a/docs/reference/html/structxmlpp_1_1SaxParser_1_1Attribute.html b/docs/reference/html/structxmlpp_1_1SaxParser_1_1Attribute.html index 3269f38..c02c663 100644 --- a/docs/reference/html/structxmlpp_1_1SaxParser_1_1Attribute.html +++ b/docs/reference/html/structxmlpp_1_1SaxParser_1_1Attribute.html @@ -2,24 +2,40 @@ + libxml++: xmlpp::SaxParser::Attribute Struct Reference + - + + + + - -
+
+ +
+ + + + +
-
libxml++ 2.35.1
+
libxml++ +  2.35.2 +
+
+ +
xmlpp::SaxParser::Attribute Struct Reference
-
+

Simple structure used in the start_element callback, in which the attributes are a list of name/value pairs. More...

@@ -61,7 +77,7 @@ Collaboration diagram for xmlpp::SaxParser::Attribute:
Collaboration graph
- +
[legend]

List of all members.

@@ -82,7 +98,7 @@ Public Attributes
- + @@ -134,9 +150,14 @@ Public Attributes
The documentation for this struct was generated from the following file:
  • parsers/saxparser.h
- - + + + + + diff --git a/docs/reference/html/structxmlpp_1_1SaxParser_1_1AttributeHasName-members.html b/docs/reference/html/structxmlpp_1_1SaxParser_1_1AttributeHasName-members.html index e4f0c19..3ede2a9 100644 --- a/docs/reference/html/structxmlpp_1_1SaxParser_1_1AttributeHasName-members.html +++ b/docs/reference/html/structxmlpp_1_1SaxParser_1_1AttributeHasName-members.html @@ -2,24 +2,40 @@ +libxml++: Member List + - + + + + - -
+
+ +
xmlpp::SaxParser::Attribute::Attribute xmlpp::SaxParser::Attribute::Attribute ( Glib::ustring const &  n,
+ + + + +
-
libxml++ 2.35.1
+
libxml++ +  2.35.2 +
+
+ +
This is the complete list of members for xmlpp::SaxParser::AttributeHasName, including all inherited members. -
AttributeHasName(Glib::ustring const& n)xmlpp::SaxParser::AttributeHasName [inline]
namexmlpp::SaxParser::AttributeHasName
operator()(Attribute const& attribute)xmlpp::SaxParser::AttributeHasName [inline]
- +
+ + + + diff --git a/docs/reference/html/structxmlpp_1_1SaxParser_1_1AttributeHasName.html b/docs/reference/html/structxmlpp_1_1SaxParser_1_1AttributeHasName.html index c7863c8..451c22b 100644 --- a/docs/reference/html/structxmlpp_1_1SaxParser_1_1AttributeHasName.html +++ b/docs/reference/html/structxmlpp_1_1SaxParser_1_1AttributeHasName.html @@ -2,24 +2,40 @@ + libxml++: xmlpp::SaxParser::AttributeHasName Struct Reference + - + + + + - -
+
+ +
+ + + + +
-
libxml++ 2.35.1
+
libxml++ +  2.35.2 +
+
+ +
xmlpp::SaxParser::AttributeHasName Struct Reference
-
+

This functor is a helper to find an attribute by name in an AttributeList using the standard algorithm std::find_if. More...

@@ -61,7 +77,7 @@ Collaboration diagram for xmlpp::SaxParser::AttributeHasName:
Collaboration graph
- +
[legend]

List of all members.

@@ -85,7 +101,7 @@ Public Attributes
- + @@ -132,9 +148,14 @@ Public Attributes
The documentation for this struct was generated from the following file:
  • parsers/saxparser.h
- - + + + + + diff --git a/docs/reference/html/structxmlpp_1_1SaxParser_1_1AttributeHasName__coll__graph.png b/docs/reference/html/structxmlpp_1_1SaxParser_1_1AttributeHasName__coll__graph.png index 058c0a5..fa50006 100644 Binary files a/docs/reference/html/structxmlpp_1_1SaxParser_1_1AttributeHasName__coll__graph.png and b/docs/reference/html/structxmlpp_1_1SaxParser_1_1AttributeHasName__coll__graph.png differ diff --git a/docs/reference/html/structxmlpp_1_1SaxParser_1_1Attribute__coll__graph.png b/docs/reference/html/structxmlpp_1_1SaxParser_1_1Attribute__coll__graph.png index 856d632..f487e0b 100644 Binary files a/docs/reference/html/structxmlpp_1_1SaxParser_1_1Attribute__coll__graph.png and b/docs/reference/html/structxmlpp_1_1SaxParser_1_1Attribute__coll__graph.png differ diff --git a/docs/reference/libxml++-2.6.devhelp2 b/docs/reference/libxml++-2.6.devhelp2 index c30da4f..77e8ef6 100644 --- a/docs/reference/libxml++-2.6.devhelp2 +++ b/docs/reference/libxml++-2.6.devhelp2 @@ -226,6 +226,8 @@ + + diff --git a/docs/reference/libxml++-2.6.tag b/docs/reference/libxml++-2.6.tag index 37550e2..ff5a0ad 100644 --- a/docs/reference/libxml++-2.6.tag +++ b/docs/reference/libxml++-2.6.tag @@ -1,13 +1,5 @@ - - index - libxml++ Reference Manual - index - features - basics - description - sigc::trackable classsigc_1_1trackable.html @@ -1242,6 +1234,20 @@ () + const Node * + get_first_child + classxmlpp_1_1Node.html + a0e244ac3573fc927bcb0f70d6b70f5d2 + (const Glib::ustring &name=Glib::ustring()) const + + + Node * + get_first_child + classxmlpp_1_1Node.html + a5eb1d1e3d4616604da7cf58da15b6fa7 + (const Glib::ustring &name=Glib::ustring()) + + NodeList get_children classxmlpp_1_1Node.html @@ -2822,4 +2828,12 @@ + + index + libxml++ Reference Manual + index + features + basics + description + diff --git a/examples/dom_build/main.cc b/examples/dom_build/main.cc index 1ed3090..367620e 100644 --- a/examples/dom_build/main.cc +++ b/examples/dom_build/main.cc @@ -33,10 +33,8 @@ main(int /* argc */, char** /* argv */) // so we can use std::cout with UTF-8, via Glib::ustring, without exceptions. std::locale::global(std::locale("")); - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED try { - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED xmlpp::Document document; document.set_internal_subset("example_xml_doc", "", "example_xml_doc.dtd"); document.set_entity_declaration("example1", xmlpp::XML_INTERNAL_GENERAL_ENTITY, @@ -71,13 +69,11 @@ main(int /* argc */, char** /* argv */) Glib::ustring whole = document.write_to_string(); std::cout << "XML built at runtime: " << std::endl << whole << std::endl; std::cout << "namespace of root node: " << nodeRoot->get_namespace_uri() << std::endl; - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED } catch(const std::exception& ex) { std::cout << "Exception caught: " << ex.what() << std::endl; } - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED return 0; } diff --git a/examples/dom_parse_entities/main.cc b/examples/dom_parse_entities/main.cc index b0c47ff..9f67a59 100644 --- a/examples/dom_parse_entities/main.cc +++ b/examples/dom_parse_entities/main.cc @@ -86,10 +86,8 @@ int main(int argc, char* argv[]) else std::cout << std::endl << "<<< Without entity substitution >>>" << std::endl; - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED try { - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED xmlpp::DomParser parser; parser.set_validate(); parser.set_substitute_entities(substitute_entities); @@ -100,13 +98,11 @@ int main(int argc, char* argv[]) const xmlpp::Node* pNode = parser.get_document()->get_root_node(); //deleted by DomParser. print_node(pNode, substitute_entities); } - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED } catch(const std::exception& ex) { std::cout << "Exception caught: " << ex.what() << std::endl; } - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED if (substitute_entities) break; diff --git a/examples/dom_parser/main.cc b/examples/dom_parser/main.cc index 5929ce3..54785f3 100644 --- a/examples/dom_parser/main.cc +++ b/examples/dom_parser/main.cc @@ -152,10 +152,8 @@ int main(int argc, char* argv[]) else filepath = "example.xml"; - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED try { - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED xmlpp::DomParser parser; if (validate) parser.set_validate(); @@ -170,13 +168,11 @@ int main(int argc, char* argv[]) const xmlpp::Node* pNode = parser.get_document()->get_root_node(); //deleted by DomParser. print_node(pNode); } - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED } catch(const std::exception& ex) { std::cout << "Exception caught: " << ex.what() << std::endl; } - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED return 0; } diff --git a/examples/dom_parser_raw/main.cc b/examples/dom_parser_raw/main.cc index 8353f60..0db852f 100644 --- a/examples/dom_parser_raw/main.cc +++ b/examples/dom_parser_raw/main.cc @@ -70,10 +70,8 @@ int main(int argc, char* argv[]) else filepath = "example.xml"; - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED try { - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED xmlpp::DomParser parser; parser.set_validate(); parser.set_substitute_entities(); //We just want the text to be resolved/unescaped automatically. @@ -82,7 +80,6 @@ int main(int argc, char* argv[]) std::string contents = read_from_disk(filepath); std::string contents_ucs2; - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED try { contents_ucs2 = Glib::convert(contents, "UCS-2", "UTF-8"); @@ -91,10 +88,6 @@ int main(int argc, char* argv[]) { std::cerr << "Glib::convert failed: " << ex.what() << std::endl; } - #else - std::auto_ptr 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()); @@ -113,13 +106,11 @@ int main(int argc, char* argv[]) const xmlpp::Node* pNode = parser.get_document()->get_root_node(); //deleted by DomParser. print_node(pNode); } - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED } catch(const std::exception& ex) { std::cout << "Exception caught: " << ex.what() << std::endl; } - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED return 0; } diff --git a/examples/dom_read_write/main.cc b/examples/dom_read_write/main.cc index cc298ea..0ac5628 100644 --- a/examples/dom_read_write/main.cc +++ b/examples/dom_read_write/main.cc @@ -47,10 +47,8 @@ main(int argc, char* argv[]) else filepath_out = "example_output.xml"; - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED try { - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED xmlpp::DomParser parser; parser.set_validate(); parser.parse_file(filepath_in); @@ -61,13 +59,11 @@ main(int argc, char* argv[]) if(document) document->write_to_file(filepath_out); } - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED } catch(const std::exception& ex) { std::cout << "Exception caught: " << ex.what() << std::endl; } - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED return 0; } diff --git a/examples/dom_xpath/main.cc b/examples/dom_xpath/main.cc index e38fa99..f8722e0 100644 --- a/examples/dom_xpath/main.cc +++ b/examples/dom_xpath/main.cc @@ -56,10 +56,8 @@ int main(int argc, char* argv[]) else filepath = "example.xml"; - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED try { - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED xmlpp::DomParser parser(filepath); if(parser) { @@ -87,13 +85,11 @@ int main(int argc, char* argv[]) xpath_test(root, "//xref/@linkend"); } } - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED } catch(const std::exception& ex) { std::cout << "Exception caught: " << ex.what() << std::endl; } - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED return 0; } diff --git a/examples/dtdvalidation/main.cc b/examples/dtdvalidation/main.cc index 74b3ec1..84b0511 100644 --- a/examples/dtdvalidation/main.cc +++ b/examples/dtdvalidation/main.cc @@ -43,51 +43,39 @@ int main(int argc, char* argv[]) xmlpp::Document document; /* xmlpp::Element* nodeRoot = */document.create_root_node("incorrect"); - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED try { - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED xmlpp::DtdValidator validator( dtdfilepath ); - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED try { - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED validator.validate( &document ); std::cout << "Validation successful" << std::endl; - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED } catch( const xmlpp::validity_error& ) { std::cout << "Error validating the document" << std::endl; } - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED /* xmlpp::Element* nodeRoot2 = */document.create_root_node("example"); xmlpp::Element * child = document.get_root_node()->add_child("examplechild"); child->set_attribute("id", "an_id"); child->add_child("child_of_child"); - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED try { - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED xmlpp::DtdValidator validator2( dtdfilepath ); validator2.validate( &document ); std::cout << "Validation successful" << std::endl; - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED } catch( const xmlpp::validity_error& ) { std::cout << "Error validating the document" << std::endl; } - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED } catch( const xmlpp::parse_error& ) { std::cerr << "Error parsing the dtd" << std::endl; } - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } diff --git a/examples/import_node/main.cc b/examples/import_node/main.cc index 8a0b44a..22abfb4 100644 --- a/examples/import_node/main.cc +++ b/examples/import_node/main.cc @@ -13,10 +13,8 @@ int main (int /* argc */, char** /* argv */) // so we can use std::cout with UTF-8, via Glib::ustring, without exceptions. std::locale::global(std::locale("")); - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED try - { - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED + { DomParser example1("example1.xml"); DomParser example2("example2.xml"); @@ -37,12 +35,10 @@ int main (int /* argc */, char** /* argv */) string doc1_string = doc1->write_to_string_formatted(); cout << doc1_string; return EXIT_SUCCESS; - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED } catch (std::exception& ex) { cerr << "Caught exception " << ex.what() << endl; return EXIT_FAILURE; } - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } diff --git a/examples/sax_exception/main.cc b/examples/sax_exception/main.cc index b316ea7..e64610a 100644 --- a/examples/sax_exception/main.cc +++ b/examples/sax_exception/main.cc @@ -38,18 +38,14 @@ int main(int /* argc */, char** /* argv */) MySaxParser parser; - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED try { - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED parser.parse_file("example.xml"); - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED } catch(const std::exception& ex) { std::cout << "Exception caught: " << ex.what() << std::endl; } - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED return 0; } diff --git a/examples/sax_exception/myparser.cc b/examples/sax_exception/myparser.cc index b66b928..11356c6 100644 --- a/examples/sax_exception/myparser.cc +++ b/examples/sax_exception/myparser.cc @@ -38,9 +38,7 @@ MyException::~MyException() throw () void MyException::Raise() const { - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED throw *this; - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } xmlpp::exception * MyException::Clone() const @@ -83,9 +81,7 @@ void MySaxParser::on_start_element(const Glib::ustring& name, std::cout << " Attribute " << iter->name << " = " << iter->value << std::endl; } - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED throw MyException(); - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } void MySaxParser::on_end_element(const Glib::ustring& /* name */) diff --git a/examples/sax_parser/main.cc b/examples/sax_parser/main.cc index cb4ad22..bf1c088 100644 --- a/examples/sax_parser/main.cc +++ b/examples/sax_parser/main.cc @@ -42,20 +42,16 @@ main(int argc, char* argv[]) filepath = "example.xml"; // Parse the entire document in one go: - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED try { - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED MySaxParser parser; parser.set_substitute_entities(true); // parser.parse_file(filepath); - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED } catch(const xmlpp::exception& ex) { std::cout << "libxml++ exception: " << ex.what() << std::endl; } - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED // Demonstrate incremental parsing, sometimes useful for network connections: diff --git a/examples/sax_parser/myparser.cc b/examples/sax_parser/myparser.cc index b12591a..ce023d4 100644 --- a/examples/sax_parser/myparser.cc +++ b/examples/sax_parser/myparser.cc @@ -33,7 +33,6 @@ MySaxParser::~MySaxParser() { } -#ifdef LIBXMLCPP_EXCEPTIONS_ENABLED void MySaxParser::on_start_document() { std::cout << "on_start_document()" << std::endl; @@ -136,4 +135,4 @@ void MySaxParser::on_fatal_error(const Glib::ustring& text) std::cerr << "MySaxParser::on_characters(): Exception caught while converting value for std::cout: " << ex.what() << std::endl; } } -#endif + diff --git a/examples/sax_parser/myparser.h b/examples/sax_parser/myparser.h index d500af1..7774a80 100644 --- a/examples/sax_parser/myparser.h +++ b/examples/sax_parser/myparser.h @@ -32,7 +32,6 @@ public: protected: //overrides: -#ifdef LIBXMLCPP_EXCEPTIONS_ENABLED virtual void on_start_document(); virtual void on_end_document(); virtual void on_start_element(const Glib::ustring& name, @@ -43,7 +42,6 @@ protected: virtual void on_warning(const Glib::ustring& text); virtual void on_error(const Glib::ustring& text); virtual void on_fatal_error(const Glib::ustring& text); -#endif }; diff --git a/examples/sax_parser_build_dom/main.cc b/examples/sax_parser_build_dom/main.cc index 8292cc9..c2f019d 100644 --- a/examples/sax_parser_build_dom/main.cc +++ b/examples/sax_parser_build_dom/main.cc @@ -47,10 +47,8 @@ main(int argc, char* argv[]) else filepath = "example.xml"; - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED try { - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED SVG::Document doc; SVG::Parser parser(doc); @@ -69,13 +67,11 @@ main(int argc, char* argv[]) SVG::Path* path = dynamic_cast(nl[0]); std::cout << "style of first path node with a style = \"" << path->get_style() << "\"" << std::endl; } - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED } catch(const xmlpp::exception& ex) { std::cout << "libxml++ exception: " << ex.what() << std::endl; } - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED return 0; } diff --git a/examples/sax_parser_entities/main.cc b/examples/sax_parser_entities/main.cc index e0e8df2..7075fce 100644 --- a/examples/sax_parser_entities/main.cc +++ b/examples/sax_parser_entities/main.cc @@ -41,20 +41,16 @@ main(int argc, char* argv[]) else filepath = "example.xml"; - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED try { - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED MySaxParser parser; parser.set_substitute_entities(false); //We want to know about the entities, not have them substituted automatically. parser.parse_file(filepath); - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED } catch(const xmlpp::exception& ex) { std::cout << "libxml++ exception: " << ex.what() << std::endl; } - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED return 0; } diff --git a/examples/schemavalidation/main.cc b/examples/schemavalidation/main.cc index 6b6fb63..2206660 100644 --- a/examples/schemavalidation/main.cc +++ b/examples/schemavalidation/main.cc @@ -60,10 +60,8 @@ int main(int argc, char* argv[]) } catch( const xmlpp::validity_error& error) { -#ifdef LIBXMLCPP_EXCEPTIONS_ENABLED std::cout << "Error validating the document" << std::endl; - std::cout << error.what(); -#endif + std::cout << error.what(); } } catch( const xmlpp::parse_error& ) diff --git a/examples/textreader/main.cc b/examples/textreader/main.cc index 0016d73..a6957e7 100644 --- a/examples/textreader/main.cc +++ b/examples/textreader/main.cc @@ -48,10 +48,8 @@ int main(int /* argc */, char** /* argv */) // so we can use std::cout with UTF-8, via Glib::ustring, without exceptions. std::locale::global(std::locale("")); - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED try { - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED xmlpp::TextReader reader("example.xml"); while(reader.read()) @@ -82,12 +80,10 @@ int main(int /* argc */, char** /* argv */) std::cout << indent(depth) << "novalue" << std::endl; } - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED } catch(const std::exception& e) { std::cout << "Exception caught: " << e.what() << std::endl; } - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } diff --git a/libxml++/document.cc b/libxml++/document.cc index 03e6996..06cf137 100644 --- a/libxml++/document.cc +++ b/libxml++/document.cc @@ -145,11 +145,7 @@ Element* Document::create_root_node_by_import(const Node* node, xmlNode* imported_node = xmlDocCopyNode(const_cast(node->cobj()), impl_, recursive); if (!imported_node) { - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED throw exception("Unable to import node"); - #else - return 0; - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } xmlDocSetRootElement(impl_, imported_node); @@ -162,11 +158,7 @@ CommentNode* Document::add_comment(const Glib::ustring& content) xmlNode* node = xmlNewComment((const xmlChar*)content.c_str()); if(!node) { - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED throw internal_error("Cannot create comment node"); - #else - return 0; - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } // Use the result, because node can be freed when merging text nodes: @@ -181,11 +173,7 @@ ProcessingInstructionNode* Document::add_processing_instruction( xmlNode* node = xmlNewDocPI(impl_, (const xmlChar*)name.c_str(), (const xmlChar*)content.c_str()); if(!node) { - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED throw internal_error("Cannot create processing instruction node"); - #else - return 0; - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } node = xmlAddChild((xmlNode*)impl_, node); Node::create_wrapper(node); @@ -234,11 +222,7 @@ void Document::do_write_to_file( if(result == -1) { - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED throw exception("do_write_to_file() failed."); - #else - return; - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } } @@ -256,11 +240,7 @@ Glib::ustring Document::do_write_to_string( if(!buffer) { - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED throw exception("do_write_to_string() failed."); - #else - return Glib::ustring(); - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } // Create a Glib::ustring copy of the buffer @@ -285,11 +265,7 @@ void Document::do_write_to_stream(std::ostream& output, const Glib::ustring& enc if(result == -1) { - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED throw exception("do_write_to_stream() failed."); - #else - return; - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } } diff --git a/libxml++/exceptions/exception.cc b/libxml++/exceptions/exception.cc index da36c64..40c71a9 100644 --- a/libxml++/exceptions/exception.cc +++ b/libxml++/exceptions/exception.cc @@ -19,9 +19,7 @@ const char* exception::what() const throw() void exception::Raise() const { - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED throw *this; - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } exception * exception::Clone() const diff --git a/libxml++/exceptions/internal_error.cc b/libxml++/exceptions/internal_error.cc index fbff40c..1cea292 100644 --- a/libxml++/exceptions/internal_error.cc +++ b/libxml++/exceptions/internal_error.cc @@ -13,9 +13,7 @@ internal_error::~internal_error() throw() void internal_error::Raise() const { - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED throw *this; - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } exception * internal_error::Clone() const diff --git a/libxml++/exceptions/parse_error.cc b/libxml++/exceptions/parse_error.cc index 7e37993..2ad8ccd 100644 --- a/libxml++/exceptions/parse_error.cc +++ b/libxml++/exceptions/parse_error.cc @@ -12,9 +12,7 @@ parse_error::~parse_error() throw() void parse_error::Raise() const { - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED throw *this; - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } exception* parse_error::Clone() const diff --git a/libxml++/exceptions/validity_error.cc b/libxml++/exceptions/validity_error.cc index f10d890..5376d3a 100644 --- a/libxml++/exceptions/validity_error.cc +++ b/libxml++/exceptions/validity_error.cc @@ -12,9 +12,7 @@ validity_error::~validity_error() throw() void validity_error::Raise() const { - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED throw *this; - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } exception* validity_error::Clone() const diff --git a/libxml++/io/outputbuffer.cc b/libxml++/io/outputbuffer.cc index fb7b3bc..7f0beee 100644 --- a/libxml++/io/outputbuffer.cc +++ b/libxml++/io/outputbuffer.cc @@ -51,11 +51,7 @@ namespace xmlpp handler = xmlFindCharEncodingHandler(encoding.c_str()); if(handler == 0) { - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED throw internal_error("Cannot initialise an encoder to " + encoding); - #else - return; - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } } } @@ -67,9 +63,7 @@ namespace xmlpp handler); if(impl_ == 0) { - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED throw internal_error("Cannot initialise underlying xmlOutputBuffer"); - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } } diff --git a/libxml++/io/parserinputbuffer.cc b/libxml++/io/parserinputbuffer.cc index d033d74..223c08a 100644 --- a/libxml++/io/parserinputbuffer.cc +++ b/libxml++/io/parserinputbuffer.cc @@ -41,9 +41,7 @@ namespace xmlpp XML_CHAR_ENCODING_NONE); if(impl_ == 0) { - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED throw internal_error("Cannot initialise underlying xmlParserInputBuffer"); - #endif } } diff --git a/libxml++/nodes/contentnode.cc b/libxml++/nodes/contentnode.cc index 6f8d680..7153c3c 100644 --- a/libxml++/nodes/contentnode.cc +++ b/libxml++/nodes/contentnode.cc @@ -23,11 +23,7 @@ Glib::ustring ContentNode::get_content() const { if(cobj()->type == XML_ELEMENT_NODE) { - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED throw internal_error("this node type doesn't have content"); - #else - return Glib::ustring(); - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } return cobj()->content ? (char*)cobj()->content : ""; @@ -37,13 +33,8 @@ void ContentNode::set_content(const Glib::ustring& content) { if(cobj()->type == XML_ELEMENT_NODE) { - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED throw internal_error("can't set content for this node type"); - #else - return; - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED - } - + } xmlNodeSetContent(cobj(), (xmlChar*)content.c_str()); } diff --git a/libxml++/nodes/element.cc b/libxml++/nodes/element.cc index 365d5ac..2e3f786 100644 --- a/libxml++/nodes/element.cc +++ b/libxml++/nodes/element.cc @@ -92,9 +92,7 @@ Attribute* Element::set_attribute(const Glib::ustring& name, const Glib::ustring } else { - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED throw exception("The namespace prefix (" + ns_prefix + ") has not been declared."); - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } } diff --git a/libxml++/nodes/node.cc b/libxml++/nodes/node.cc index 6ce2b64..9555e9d 100644 --- a/libxml++/nodes/node.cc +++ b/libxml++/nodes/node.cc @@ -76,6 +76,38 @@ Node* Node::get_previous_sibling() return static_cast(cobj()->prev->_private); } +static Node* _convert_node(xmlNode* node) +{ + Node* res = 0; + if(node) + { + Node::create_wrapper(node); + res = static_cast(node->_private); + } + return res; +} + +Node* Node::get_first_child(const Glib::ustring& name) +{ + xmlNode* child = impl_->children; + if(!child) + return 0; + + do + { + if(name.empty() || name == (const char*)child->name) + return _convert_node(child); + } + while((child = child->next)); + + return 0; +} + +const Node* Node::get_first_child(const Glib::ustring& name) const +{ + return const_cast(this)->get_first_child(name); +} + Node::NodeList Node::get_children(const Glib::ustring& name) { xmlNode* child = impl_->children; @@ -86,10 +118,7 @@ Node::NodeList Node::get_children(const Glib::ustring& name) do { if(name.empty() || name == (const char*)child->name) - { - Node::create_wrapper(child); - children.push_back(reinterpret_cast(child->_private)); - } + children.push_back(_convert_node(child)); } while((child = child->next)); @@ -160,11 +189,7 @@ _xmlNode* Node::create_new_child_node(const Glib::ustring& name, const Glib::ust if(impl_->type != XML_ELEMENT_NODE) { - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED - throw internal_error("You can only add child nodes to element nodes"); - #else - return 0; - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED + throw internal_error("You can only add child nodes to element nodes"); } if(ns_prefix.empty()) @@ -178,11 +203,7 @@ _xmlNode* Node::create_new_child_node(const Glib::ustring& name, const Glib::ust ns = xmlSearchNs(impl_->doc, impl_, (const xmlChar*)ns_prefix.c_str()); if (!ns) { - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED throw exception("The namespace prefix (" + ns_prefix + ") has not been declared."); - #else - return 0; - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } } @@ -207,11 +228,7 @@ Node* Node::import_node(const Node* node, bool recursive) xmlNode* imported_node = xmlDocCopyNode(const_cast(node->cobj()), impl_->doc, recursive); if (!imported_node) { - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED throw exception("Unable to import node"); - #else - return 0; - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } //Add the node: @@ -221,11 +238,7 @@ Node* Node::import_node(const Node* node, bool recursive) Node::free_wrappers(imported_node); xmlFreeNode(imported_node); - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED throw exception("Unable to add imported node to current node"); - #else - return 0; - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } Node::create_wrapper(imported_node); @@ -274,11 +287,7 @@ static NodeSet find_impl(xmlXPathContext* ctxt, const Glib::ustring& xpath) { xmlXPathFreeContext(ctxt); - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED throw exception("Invalid XPath: " + xpath); - #else - return NodeSet(); - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } if(result->type != XPATH_NODESET) @@ -286,11 +295,7 @@ static NodeSet find_impl(xmlXPathContext* ctxt, const Glib::ustring& xpath) xmlXPathFreeObject(result); xmlXPathFreeContext(ctxt); - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED throw internal_error("Only nodeset result types are supported."); - #else - return NodeSet(); - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } xmlNodeSet* nodeset = result->nodesetval; @@ -403,11 +408,7 @@ void Node::set_namespace(const Glib::ustring& ns_prefix) { if (impl_->type == XML_ATTRIBUTE_DECL) { - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED throw exception("Can't set the namespace of an attribute declaration"); - #else - return; - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } //Look for the existing namespace to use: @@ -419,9 +420,7 @@ void Node::set_namespace(const Glib::ustring& ns_prefix) } else { - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED throw exception("The namespace (" + ns_prefix + ") has not been declared."); - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } } diff --git a/libxml++/nodes/node.h b/libxml++/nodes/node.h index 9b8e909..06d2753 100644 --- a/libxml++/nodes/node.h +++ b/libxml++/nodes/node.h @@ -96,6 +96,20 @@ public: */ Node* get_previous_sibling(); + /** Get the first child of this node. You may optionally get the first child node which has a certain name. + * @returns The first child + * + * @newin{2,36} + */ + const Node* get_first_child(const Glib::ustring& name = Glib::ustring()) const; + + /** Get the first child of this node. You may optionally get the first child node which has a certain name. + * @returns The first child + * + * @newin{2,36} + */ + Node* get_first_child(const Glib::ustring& name = Glib::ustring()); + /** Obtain the list of child nodes. You may optionally obtain a list of only the child nodes which have a certain name. * @param name The names of the child nodes to get. If you do not specigy a name, then the list will contain all nodes, regardless of their names. * @returns The list of child nodes. diff --git a/libxml++/parsers/domparser.cc b/libxml++/parsers/domparser.cc index 0bd249c..52fb8d2 100644 --- a/libxml++/parsers/domparser.cc +++ b/libxml++/parsers/domparser.cc @@ -50,11 +50,7 @@ void DomParser::parse_file(const Glib::ustring& filename) if(!context_) { - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED throw internal_error("Couldn't create parsing context\n" + format_xml_error()); - #else - return; - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } if(context_->directory == 0) @@ -78,11 +74,7 @@ void DomParser::parse_memory_raw(const unsigned char* contents, size_type bytes_ if(!context_) { - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED throw internal_error("Couldn't create parsing context\n" + format_xml_error()); - #else - return; - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } parse_context(); @@ -104,11 +96,7 @@ void DomParser::parse_context() if(!context_) { - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED throw internal_error("Context not initialized\n" + format_xml_error()); - #else - return; - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } xmlParseDocument(context_); @@ -121,11 +109,7 @@ void DomParser::parse_context() { release_underlying(); //Free doc_ and context_ - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED throw parse_error(error_str); - #else - return; - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } doc_ = new Document(context_->myDoc); @@ -157,11 +141,7 @@ void DomParser::parse_stream(std::istream& in) if(!context_) { - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED throw internal_error("Couldn't create parsing context\n" + format_xml_error()); - #else - return; - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } initialize_context(); @@ -187,11 +167,7 @@ void DomParser::parse_stream(std::istream& in) { release_underlying(); //Free doc_ and context_ - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED throw parse_error(error_str); - #else - return; - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } doc_ = new Document(context_->myDoc); diff --git a/libxml++/parsers/parser.cc b/libxml++/parsers/parser.cc index f458ed4..b1055b7 100644 --- a/libxml++/parsers/parser.cc +++ b/libxml++/parsers/parser.cc @@ -259,10 +259,9 @@ void Parser::callback_error_or_warning(MsgType msg_type, void* ctx, vsnprintf(buff, sizeof(buff)/sizeof(buff[0]), msg, var_args); ubuff = buff; } - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED + try { - #endif switch (msg_type) { case MsgParserError: @@ -278,13 +277,11 @@ void Parser::callback_error_or_warning(MsgType msg_type, void* ctx, parser->on_validity_warning(ubuff); break; } - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED } catch(const exception& e) { parser->handleException(e); } - #endif } } } diff --git a/libxml++/parsers/saxparser.cc b/libxml++/parsers/saxparser.cc index 7c5d240..d937cbf 100644 --- a/libxml++/parsers/saxparser.cc +++ b/libxml++/parsers/saxparser.cc @@ -127,17 +127,10 @@ void SaxParser::on_error(const Glib::ustring& /* text */) } -#ifdef LIBXMLCPP_EXCEPTIONS_ENABLED void SaxParser::on_fatal_error(const Glib::ustring& text) { throw parse_error("Fatal error: " + text); } -#else -void SaxParser::on_fatal_error(const Glib::ustring&) -{ - //throw parse_error("Fatal error: " + text); -} -#endif //LIBXMLCPP_EXCEPTIONS_ENABLED void SaxParser::on_cdata_block(const Glib::ustring& /* text */) { @@ -155,12 +148,9 @@ void SaxParser::on_internal_subset(const Glib::ustring& name, void SaxParser::parse() { - if(!context_) { - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED + if(!context_) + { throw internal_error("Parse context not created."); - #else - return; - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } xmlSAXHandlerPtr old_sax = context_->sax; @@ -183,12 +173,9 @@ void SaxParser::parse() void SaxParser::parse_file(const Glib::ustring& filename) { - if(context_) { - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED + if(context_) + { throw parse_error("Attempt to start a second parse while a parse is in progress."); - #else - return; - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } KeepBlanks k(KeepBlanks::Default); @@ -199,12 +186,9 @@ void SaxParser::parse_file(const Glib::ustring& filename) void SaxParser::parse_memory_raw(const unsigned char* contents, size_type bytes_count) { - if(context_) { - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED + if(context_) + { throw parse_error("Attempt to start a second parse while a parse is in progress."); - #else - return; - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } KeepBlanks k(KeepBlanks::Default); @@ -220,12 +204,9 @@ void SaxParser::parse_memory(const Glib::ustring& contents) void SaxParser::parse_stream(std::istream& in) { - if(context_) { - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED + if(context_) + { throw parse_error("Attempt to start a second parse while a parse is in progress."); - #else - return; - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } KeepBlanks k(KeepBlanks::Default); @@ -318,18 +299,14 @@ xmlEntityPtr SaxParserCallback::get_entity(void* context, const xmlChar* name) SaxParser* parser = static_cast(the_context->_private); xmlEntityPtr result = 0; - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED try { - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED result = parser->on_get_entity((const char*)name); - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED } catch(const exception& e) { parser->handleException(e); } - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED return result; } @@ -339,23 +316,19 @@ void SaxParserCallback::entity_decl(void* context, const xmlChar* name, int type _xmlParserCtxt* the_context = static_cast<_xmlParserCtxt*>(context); SaxParser* parser = static_cast(the_context->_private); - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED try { - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED parser->on_entity_declaration( ( name ? Glib::ustring((const char*)name) : ""), static_cast(type), ( publicId ? Glib::ustring((const char*)publicId) : ""), ( systemId ? Glib::ustring((const char*)systemId) : ""), ( content ? Glib::ustring((const char*)content) : "") ); - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED } catch(const exception& e) { parser->handleException(e); } - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } void SaxParserCallback::start_document(void* context) @@ -363,18 +336,14 @@ void SaxParserCallback::start_document(void* context) _xmlParserCtxt* the_context = static_cast<_xmlParserCtxt*>(context); SaxParser* parser = static_cast(the_context->_private); - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED try { - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED parser->on_start_document(); - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED } catch(const exception& e) { parser->handleException(e); } - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } void SaxParserCallback::end_document(void* context) @@ -385,18 +354,14 @@ void SaxParserCallback::end_document(void* context) if(parser->exception_) return; - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED try { - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED parser->on_end_document(); - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED } catch(const exception& e) { parser->handleException(e); } - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } void SaxParserCallback::start_element(void* context, @@ -413,18 +378,14 @@ void SaxParserCallback::start_element(void* context, attributes.push_back( SaxParser::Attribute( (char*)*cur, (char*)*(cur + 1) )); - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED try { - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED parser->on_start_element(Glib::ustring((const char*) name), attributes); - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED } catch(const exception& e) { parser->handleException(e); } - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } void SaxParserCallback::end_element(void* context, const xmlChar* name) @@ -432,18 +393,14 @@ void SaxParserCallback::end_element(void* context, const xmlChar* name) _xmlParserCtxt* the_context = static_cast<_xmlParserCtxt*>(context); SaxParser* parser = static_cast(the_context->_private); - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED try { - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED parser->on_end_element(Glib::ustring((const char*) name)); - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED } catch(const exception& e) { parser->handleException(e); } - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } void SaxParserCallback::characters(void * context, const xmlChar* ch, int len) @@ -451,10 +408,8 @@ void SaxParserCallback::characters(void * context, const xmlChar* ch, int len) _xmlParserCtxt* the_context = static_cast<_xmlParserCtxt*>(context); SaxParser* parser = static_cast(the_context->_private); - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED try { - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED // Here we force the use of Glib::ustring::ustring( InputIterator begin, InputIterator end ) // instead of Glib::ustring::ustring( const char*, size_type ) because it // expects the length of the string in characters, not in bytes. @@ -462,13 +417,11 @@ void SaxParserCallback::characters(void * context, const xmlChar* ch, int len) Glib::ustring( reinterpret_cast(ch), reinterpret_cast(ch + len) ) ); - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED } catch(const exception& e) { parser->handleException(e); } - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } void SaxParserCallback::comment(void* context, const xmlChar* value) @@ -476,18 +429,14 @@ void SaxParserCallback::comment(void* context, const xmlChar* value) _xmlParserCtxt* the_context = static_cast<_xmlParserCtxt*>(context); SaxParser* parser = static_cast(the_context->_private); - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED try { - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED parser->on_comment(Glib::ustring((const char*) value)); - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED } catch(const exception& e) { parser->handleException(e); } - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } void SaxParserCallback::warning(void* context, const char* fmt, ...) @@ -502,18 +451,14 @@ void SaxParserCallback::warning(void* context, const char* fmt, ...) vsnprintf(buff, sizeof(buff)/sizeof(buff[0]), fmt, arg); va_end(arg); - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED try { - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED parser->on_warning(Glib::ustring(buff)); - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED } catch(const exception& e) { parser->handleException(e); } - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } void SaxParserCallback::error(void* context, const char* fmt, ...) @@ -531,18 +476,14 @@ void SaxParserCallback::error(void* context, const char* fmt, ...) vsnprintf(buff, sizeof(buff)/sizeof(buff[0]), fmt, arg); va_end(arg); - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED try { - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED parser->on_error(Glib::ustring(buff)); - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED } catch(const exception& e) { parser->handleException(e); } - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } void SaxParserCallback::fatal_error(void* context, const char* fmt, ...) @@ -557,18 +498,14 @@ void SaxParserCallback::fatal_error(void* context, const char* fmt, ...) vsnprintf(buff, sizeof(buff)/sizeof(buff[0]), fmt, arg); va_end(arg); - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED try { - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED parser->on_fatal_error(Glib::ustring(buff)); - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED } catch(const exception& e) { parser->handleException(e); } - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } void SaxParserCallback::cdata_block(void* context, const xmlChar* value, int len) @@ -576,23 +513,19 @@ void SaxParserCallback::cdata_block(void* context, const xmlChar* value, int len _xmlParserCtxt* the_context = static_cast<_xmlParserCtxt*>(context); SaxParser* parser = static_cast(the_context->_private); - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED try { - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED // Here we force the use of Glib::ustring::ustring( InputIterator begin, InputIterator end ) // see comments in SaxParserCallback::characters parser->on_cdata_block( Glib::ustring( reinterpret_cast(value), reinterpret_cast(value + len) ) ); - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED } catch(const exception& e) { parser->handleException(e); } - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } void SaxParserCallback::internal_subset(void* context, const xmlChar* name, @@ -601,21 +534,17 @@ void SaxParserCallback::internal_subset(void* context, const xmlChar* name, _xmlParserCtxt* the_context = static_cast<_xmlParserCtxt*>(context); SaxParser* parser = static_cast(the_context->_private); - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED try { - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED const Glib::ustring pid = publicId ? Glib::ustring((const char*) publicId) : ""; const Glib::ustring sid = systemId ? Glib::ustring((const char*) systemId) : ""; parser->on_internal_subset( Glib::ustring((const char*) name), pid, sid); - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED } catch(const exception& e) { parser->handleException(e); } - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } } // namespace xmlpp diff --git a/libxml++/parsers/textreader.cc b/libxml++/parsers/textreader.cc index c196d57..4a258dc 100644 --- a/libxml++/parsers/textreader.cc +++ b/libxml++/parsers/textreader.cc @@ -43,9 +43,7 @@ TextReader::TextReader( { if( ! impl_ ) { - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED throw internal_error("Cannot instantiate underlying libxml2 structure"); - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } setup_exceptions(); @@ -58,9 +56,7 @@ TextReader::TextReader( { if( ! impl_ ) { - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED throw internal_error("Cannot instantiate underlying libxml2 structure"); - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } setup_exceptions(); @@ -389,12 +385,10 @@ void TextReader::check_for_exceptions() const ths->severity_ = 0; //TODO: Offer an alternative when not using exceptions? - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED if( severity == XML_PARSER_SEVERITY_ERROR ) throw parse_error(error_); else if( severity == XML_PARSER_SEVERITY_VALIDITY_ERROR ) throw validity_error(error_); - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } int TextReader::PropertyReader::Int(int value) diff --git a/libxml++/parsers/textreader.h b/libxml++/parsers/textreader.h index 1f730cd..595e2e5 100644 --- a/libxml++/parsers/textreader.h +++ b/libxml++/parsers/textreader.h @@ -200,8 +200,8 @@ class TextReader: NonCopyable bool is_valid() const; private: - struct PropertyReader; - friend struct PropertyReader; + class PropertyReader; + friend class PropertyReader; void setup_exceptions(); static void on_libxml_error(void * arg, const char *msg, int severity, diff --git a/libxml++/schema.cc b/libxml++/schema.cc index a589083..581bb55 100644 --- a/libxml++/schema.cc +++ b/libxml++/schema.cc @@ -40,22 +40,14 @@ void Schema::set_document(Document* document, bool embed) if(!context) { -#ifdef LIBXMLCPP_EXCEPTIONS_ENABLED throw parse_error("Schema could not be parsed"); -#else - return; -#endif } impl_ = xmlSchemaParse(context); if(!impl_) { xmlSchemaFreeParserCtxt(context); -#ifdef LIBXMLCPP_EXCEPTIONS_ENABLED throw parse_error("Schema could not be parsed"); -#else - return; -#endif } impl_->_private = this; diff --git a/libxml++/validators/dtdvalidator.cc b/libxml++/validators/dtdvalidator.cc index 5517720..f000214 100644 --- a/libxml++/validators/dtdvalidator.cc +++ b/libxml++/validators/dtdvalidator.cc @@ -61,11 +61,7 @@ void DtdValidator::parse_subset(const Glib::ustring& external,const Glib::ustrin if (!dtd) { - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED throw parse_error("Dtd could not be parsed"); - #else - return; - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } Node::create_wrapper(reinterpret_cast(dtd)); @@ -90,11 +86,7 @@ void DtdValidator::parse_stream(std::istream& in) if (!dtd) { - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED throw parse_error("Dtd could not be parsed"); - #else - return; - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } Node::create_wrapper(reinterpret_cast(dtd)); @@ -137,20 +129,12 @@ bool DtdValidator::validate(const Document* doc) if(!valid_) { - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED throw internal_error("Couldn't create parsing context"); - #else - return false; - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } if (!doc) { - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED throw internal_error("Document pointer cannot be 0"); - #else - return false; - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } initialize_valid(); @@ -161,11 +145,7 @@ bool DtdValidator::validate(const Document* doc) { check_for_exception(); - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED throw validity_error("Document failed Dtd validation"); - #else - return false; - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } return res; diff --git a/libxml++/validators/schemavalidator.cc b/libxml++/validators/schemavalidator.cc index 4f82313..2a73640 100644 --- a/libxml++/validators/schemavalidator.cc +++ b/libxml++/validators/schemavalidator.cc @@ -74,10 +74,8 @@ void SchemaValidator::parse_context(_xmlSchemaParserCtxt* context) release_underlying(); // Free any existing dtd. xmlSchema* schema = xmlSchemaParse( context ); -#ifdef LIBXMLCPP_EXCEPTIONS_ENABLED if ( ! schema ) throw parse_error("Schema could not be parsed"); -#endif schema->_private = new Schema(schema); @@ -155,26 +153,20 @@ void SchemaValidator::initialize_valid() bool SchemaValidator::validate(const Document* doc) { -#ifdef LIBXMLCPP_EXCEPTIONS_ENABLED if (!doc) throw internal_error("Document pointer cannot be 0"); -#endif -#ifdef LIBXMLCPP_EXCEPTIONS_ENABLED if (!schema_) throw internal_error("Must have a schema to validate document"); -#endif // A context is required at this stage only if (!ctxt_) ctxt_ = xmlSchemaNewValidCtxt( schema_->cobj() ); -#ifdef LIBXMLCPP_EXCEPTIONS_ENABLED if(!ctxt_) { throw internal_error("Couldn't create validating context"); } -#endif initialize_valid(); @@ -183,9 +175,7 @@ bool SchemaValidator::validate(const Document* doc) if(res != 0) { check_for_exception(); -#ifdef LIBXMLCPP_EXCEPTIONS_ENABLED throw validity_error("Document failed schema validation"); -#endif } return res; @@ -193,25 +183,19 @@ bool SchemaValidator::validate(const Document* doc) bool SchemaValidator::validate(const Glib::ustring& file) { -#ifdef LIBXMLCPP_EXCEPTIONS_ENABLED if (file.empty()) throw internal_error("File path must not be empty"); -#endif -#ifdef LIBXMLCPP_EXCEPTIONS_ENABLED if (!schema_) throw internal_error("Must have a schema to validate document"); -#endif // A context is required at this stage only if (!ctxt_) ctxt_ = xmlSchemaNewValidCtxt( schema_->cobj() ); -#ifdef LIBXMLCPP_EXCEPTIONS_ENABLED if(!ctxt_) { throw internal_error("Couldn't create validating context"); } -#endif initialize_valid(); int res = xmlSchemaValidateFile( ctxt_, file.c_str(), 0 ); @@ -219,9 +203,7 @@ bool SchemaValidator::validate(const Glib::ustring& file) if(res != 0) { check_for_exception(); -#ifdef LIBXMLCPP_EXCEPTIONS_ENABLED throw validity_error("Document failed schema validation"); -#endif } return res; diff --git a/libxml++/validators/validator.cc b/libxml++/validators/validator.cc index e5e9d8f..119ba61 100644 --- a/libxml++/validators/validator.cc +++ b/libxml++/validators/validator.cc @@ -95,18 +95,14 @@ void Validator::callback_validity_error(void* valid_, const char* msg, ...) vsnprintf(buff, sizeof(buff)/sizeof(buff[0]), msg, arg); va_end(arg); - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED try { - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED validator->on_validity_error(Glib::ustring(buff)); - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED } catch(const exception& e) { validator->handleException(e); } - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } } @@ -124,18 +120,14 @@ void Validator::callback_validity_warning(void* valid_, const char* msg, ...) vsnprintf(buff, sizeof(buff)/sizeof(buff[0]), msg, arg); va_end(arg); - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED try { - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED validator->on_validity_warning(Glib::ustring(buff)); - #ifdef LIBXMLCPP_EXCEPTIONS_ENABLED } catch(const exception& e) { validator->handleException(e); } - #endif //LIBXMLCPP_EXCEPTIONS_ENABLED } } diff --git a/macros/config.guess b/macros/config.guess index 40eaed4..d622a44 100755 --- a/macros/config.guess +++ b/macros/config.guess @@ -2,9 +2,9 @@ # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011 Free Software Foundation, Inc. +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2011-05-11' +timestamp='2012-02-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -17,9 +17,7 @@ timestamp='2011-05-11' # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -57,8 +55,8 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free -Software Foundation, Inc. +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -145,7 +143,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward @@ -792,13 +790,12 @@ EOF echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=`/usr/bin/uname -p` + case ${UNAME_PROCESSOR} in amd64) echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac exit ;; i*:CYGWIN*:*) @@ -807,6 +804,9 @@ EOF *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; + i*:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; i*:windows32*:*) # uname -m includes "-pc" on this system. echo ${UNAME_MACHINE}-mingw32 @@ -861,6 +861,13 @@ EOF i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; + aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -895,13 +902,16 @@ EOF echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; cris:Linux:*:*) - echo cris-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; frv:Linux:*:*) - echo frv-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + hexagon:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:Linux:*:*) LIBC=gnu @@ -943,7 +953,7 @@ EOF test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) - echo or32-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; padre:Linux:*:*) echo sparc-unknown-linux-gnu @@ -978,13 +988,13 @@ EOF echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-tilera-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; vax:Linux:*:*) echo ${UNAME_MACHINE}-dec-linux-gnu exit ;; x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; xtensa*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -1315,6 +1325,9 @@ EOF i*86:AROS:*:*) echo ${UNAME_MACHINE}-pc-aros exit ;; + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 diff --git a/macros/config.sub b/macros/config.sub index 30fdca8..c894da4 100755 --- a/macros/config.sub +++ b/macros/config.sub @@ -2,9 +2,9 @@ # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011 Free Software Foundation, Inc. +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2011-03-23' +timestamp='2012-02-10' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -21,9 +21,7 @@ timestamp='2011-03-23' # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -76,8 +74,8 @@ version="\ GNU config.sub ($timestamp) Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free -Software Foundation, Inc. +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -132,6 +130,10 @@ case $maybe_os in os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; + android-linux) + os=-linux-android + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; *) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ] @@ -247,17 +249,22 @@ case $basic_machine in # Some are omitted here because they have special meanings below. 1750a | 580 \ | a29k \ + | aarch64 | aarch64_be \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | be32 | be64 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ + | epiphany \ | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ | maxq | mb | microblaze | mcore | mep | metag \ @@ -291,7 +298,7 @@ case $basic_machine in | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ - | rx \ + | rl78 | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ @@ -300,7 +307,7 @@ case $basic_machine in | spu \ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ - | v850 | v850e \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | we32k \ | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) @@ -315,8 +322,7 @@ case $basic_machine in c6x) basic_machine=tic6x-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | picochip) - # Motorola 68HC11/12. + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -329,7 +335,10 @@ case $basic_machine in strongarm | thumb | xscale) basic_machine=arm-unknown ;; - + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; xscaleeb) basic_machine=armeb-unknown ;; @@ -352,11 +361,13 @@ case $basic_machine in # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ + | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ + | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ | clipper-* | craynv-* | cydra-* \ @@ -365,8 +376,10 @@ case $basic_machine in | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ @@ -400,7 +413,7 @@ case $basic_machine in | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ - | romp-* | rs6000-* | rx-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ @@ -408,10 +421,11 @@ case $basic_machine in | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ | tahoe-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tile-* | tilegx-* \ + | tile*-* \ | tron-* \ | ubicom32-* \ - | v850-* | v850e-* | vax-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ @@ -711,7 +725,6 @@ case $basic_machine in i370-ibm* | ibm*) basic_machine=i370-ibm ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 @@ -808,10 +821,18 @@ case $basic_machine in ms1-*) basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; + msys) + basic_machine=i386-pc + os=-msys + ;; mvs) basic_machine=i370-ibm os=-mvs ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 @@ -1120,13 +1141,8 @@ case $basic_machine in basic_machine=t90-cray os=-unicos ;; - # This must be matched before tile*. - tilegx*) - basic_machine=tilegx-unknown - os=-linux-gnu - ;; tile*) - basic_machine=tile-unknown + basic_machine=$basic_machine-unknown os=-linux-gnu ;; tx39) @@ -1336,7 +1352,7 @@ case $os in | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ @@ -1548,9 +1564,6 @@ case $basic_machine in ;; m68000-sun) os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 ;; m68*-cisco) os=-aout diff --git a/macros/depcomp b/macros/depcomp index df8eea7..bd0ac08 100755 --- a/macros/depcomp +++ b/macros/depcomp @@ -1,10 +1,10 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2009-04-28.21; # UTC +scriptversion=2011-12-04.11; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free -# Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, +# 2011 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -44,7 +44,7 @@ Environment variables: object Object file output by `PROGRAMS ARGS'. DEPDIR directory where to store dependencies. depfile Dependency file to output. - tmpdepfile Temporary file to use when outputing dependencies. + tmpdepfile Temporary file to use when outputting dependencies. libtool Whether libtool is used (yes/no). Report bugs to . @@ -90,10 +90,18 @@ if test "$depmode" = msvcmsys; then # This is just like msvisualcpp but w/o cygpath translation. # Just convert the backslash-escaped backslashes to single forward # slashes to satisfy depend.m4 - cygpath_u="sed s,\\\\\\\\,/,g" + cygpath_u='sed s,\\\\,/,g' depmode=msvisualcpp fi +if test "$depmode" = msvc7msys; then + # This is just like msvc7 but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvc7 +fi + case "$depmode" in gcc3) ## gcc 3 implements dependency tracking that does exactly what @@ -158,10 +166,12 @@ gcc) ' < "$tmpdepfile" | ## Some versions of gcc put a space before the `:'. On the theory ## that the space means something, we add a space to the output as -## well. +## well. hp depmode also adds that space, but also prefixes the VPATH +## to the object. Take care to not repeat it in the output. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -405,6 +415,52 @@ tru64) rm -f "$tmpdepfile" ;; +msvc7) + if test "$libtool" = yes; then + showIncludes=-Wc,-showIncludes + else + showIncludes=-showIncludes + fi + "$@" $showIncludes > "$tmpdepfile" + stat=$? + grep -v '^Note: including file: ' "$tmpdepfile" + if test "$stat" = 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + # The first sed program below extracts the file names and escapes + # backslashes for cygpath. The second sed program outputs the file + # name when reading, but also accumulates all include files in the + # hold buffer in order to output them again at the end. This only + # works with sed implementations that can handle large buffers. + sed < "$tmpdepfile" -n ' +/^Note: including file: *\(.*\)/ { + s//\1/ + s/\\/\\\\/g + p +}' | $cygpath_u | sort -u | sed -n ' +s/ /\\ /g +s/\(.*\)/ \1 \\/p +s/.\(.*\) \\/\1:/ +H +$ { + s/.*/ / + G + p +}' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +msvc7msys) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + #nosideeffect) # This comment above is used by automake to tell side-effect # dependency tracking mechanisms from slower ones. @@ -503,7 +559,9 @@ makedepend) touch "$tmpdepfile" ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" + # makedepend may prepend the VPATH from the source file name to the object. + # No need to regex-escape $object, excess matching of '.' is harmless. + sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" sed '1,2d' "$tmpdepfile" | tr ' ' ' ' | \ ## Some versions of the HPUX 10.20 sed can't process this invocation diff --git a/macros/install-sh b/macros/install-sh index 6781b98..a9244eb 100755 --- a/macros/install-sh +++ b/macros/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2009-04-28.21; # UTC +scriptversion=2011-01-19.21; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -156,6 +156,10 @@ while test $# -ne 0; do -s) stripcmd=$stripprog;; -t) dst_arg=$2 + # Protect names problematic for `test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac shift;; -T) no_target_directory=true;; @@ -186,6 +190,10 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then fi shift # arg dst_arg=$arg + # Protect names problematic for `test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac done fi @@ -200,7 +208,11 @@ if test $# -eq 0; then fi if test -z "$dir_arg"; then - trap '(exit $?); exit' 1 2 13 15 + do_exit='(exit $ret); exit $ret' + trap "ret=129; $do_exit" 1 + trap "ret=130; $do_exit" 2 + trap "ret=141; $do_exit" 13 + trap "ret=143; $do_exit" 15 # Set umask so as not to create temps with too-generous modes. # However, 'strip' requires both read and write access to temps. @@ -228,9 +240,9 @@ fi for src do - # Protect names starting with `-'. + # Protect names problematic for `test' and other utilities. case $src in - -*) src=./$src;; + -* | [=\(\)!]) src=./$src;; esac if test -n "$dir_arg"; then @@ -252,12 +264,7 @@ do echo "$0: no destination specified." >&2 exit 1 fi - dst=$dst_arg - # Protect names starting with `-'. - case $dst in - -*) dst=./$dst;; - esac # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. @@ -385,7 +392,7 @@ do case $dstdir in /*) prefix='/';; - -*) prefix='./';; + [-=\(\)!]*) prefix='./';; *) prefix='';; esac @@ -403,7 +410,7 @@ do for d do - test -z "$d" && continue + test X"$d" = X && continue prefix=$prefix$d if test -d "$prefix"; then diff --git a/macros/libtool.m4 b/macros/libtool.m4 index 8ff3c76..828104c 100644 --- a/macros/libtool.m4 +++ b/macros/libtool.m4 @@ -1,8 +1,8 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -11,8 +11,8 @@ m4_define([_LT_COPYING], [dnl # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -146,6 +146,8 @@ AC_REQUIRE([AC_CANONICAL_BUILD])dnl AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl +_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl +dnl _LT_DECL([], [host_alias], [0], [The host system])dnl _LT_DECL([], [host], [0])dnl _LT_DECL([], [host_os], [0])dnl @@ -637,7 +639,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) configured by $[0], generated by m4_PACKAGE_STRING. -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2011 Free Software Foundation, Inc. This config.lt script is free software; the Free Software Foundation gives unlimited permision to copy, distribute and modify it." @@ -801,6 +803,7 @@ AC_DEFUN([LT_LANG], m4_case([$1], [C], [_LT_LANG(C)], [C++], [_LT_LANG(CXX)], + [Go], [_LT_LANG(GO)], [Java], [_LT_LANG(GCJ)], [Fortran 77], [_LT_LANG(F77)], [Fortran], [_LT_LANG(FC)], @@ -822,6 +825,31 @@ m4_defun([_LT_LANG], ])# _LT_LANG +m4_ifndef([AC_PROG_GO], [ +############################################################ +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_GO. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # +############################################################ +m4_defun([AC_PROG_GO], +[AC_LANG_PUSH(Go)dnl +AC_ARG_VAR([GOC], [Go compiler command])dnl +AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl +_AC_ARG_VAR_LDFLAGS()dnl +AC_CHECK_TOOL(GOC, gccgo) +if test -z "$GOC"; then + if test -n "$ac_tool_prefix"; then + AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) + fi +fi +if test -z "$GOC"; then + AC_CHECK_PROG(GOC, gccgo, gccgo, false) +fi +])#m4_defun +])#m4_ifndef + + # _LT_LANG_DEFAULT_CONFIG # ----------------------- m4_defun([_LT_LANG_DEFAULT_CONFIG], @@ -852,6 +880,10 @@ AC_PROVIDE_IFELSE([AC_PROG_GCJ], m4_ifdef([LT_PROG_GCJ], [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) +AC_PROVIDE_IFELSE([AC_PROG_GO], + [LT_LANG(GO)], + [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) + AC_PROVIDE_IFELSE([LT_PROG_RC], [LT_LANG(RC)], [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) @@ -954,7 +986,13 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -962,6 +1000,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ rm -rf libconftest.dylib* rm -f conftest.* fi]) + AC_CACHE_CHECK([for -exported_symbols_list linker flag], [lt_cv_ld_exported_symbols_list], [lt_cv_ld_exported_symbols_list=no @@ -973,6 +1012,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ [lt_cv_ld_exported_symbols_list=no]) LDFLAGS="$save_LDFLAGS" ]) + AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], [lt_cv_ld_force_load=no cat > conftest.c << _LT_EOF @@ -990,7 +1030,9 @@ _LT_EOF echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err _lt_result=$? - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then lt_cv_ld_force_load=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1035,8 +1077,8 @@ _LT_EOF ]) -# _LT_DARWIN_LINKER_FEATURES -# -------------------------- +# _LT_DARWIN_LINKER_FEATURES([TAG]) +# --------------------------------- # Checks for linker and compiler features on darwin m4_defun([_LT_DARWIN_LINKER_FEATURES], [ @@ -1047,6 +1089,8 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported if test "$lt_cv_ld_force_load" = "yes"; then _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], + [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) else _LT_TAGVAR(whole_archive_flag_spec, $1)='' fi @@ -1330,14 +1374,27 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) +*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -1414,13 +1471,13 @@ old_postuninstall_cmds= if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi case $host_os in @@ -1600,6 +1657,11 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl lt_cv_sys_max_cmd_len=196608 ;; + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -1639,7 +1701,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do @@ -2185,7 +2247,7 @@ need_version=unknown case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -2194,7 +2256,7 @@ aix3*) ;; aix[[4-9]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -2259,7 +2321,7 @@ beos*) ;; bsdi[[45]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -2398,7 +2460,7 @@ m4_if([$1], [],[ ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -2406,10 +2468,6 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -2417,7 +2475,7 @@ freebsd* | dragonfly*) objformat=`/usr/bin/objformat` else case $host_os in - freebsd[[123]]*) objformat=aout ;; + freebsd[[23]].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -2435,7 +2493,7 @@ freebsd* | dragonfly*) esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[[01]]* | freebsdelf3.[[01]]*) @@ -2455,7 +2513,7 @@ freebsd* | dragonfly*) ;; gnu*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' @@ -2466,7 +2524,7 @@ gnu*) ;; haiku*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -2527,7 +2585,7 @@ hpux9* | hpux10* | hpux11*) ;; interix[[3-9]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -2543,7 +2601,7 @@ irix5* | irix6* | nonstopux*) nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -2580,9 +2638,9 @@ linux*oldld* | linux*aout* | linux*coff*) dynamic_linker=no ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2657,7 +2715,7 @@ netbsd*) ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -2726,7 +2784,7 @@ rdos*) ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2751,7 +2809,7 @@ sunos4*) ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -2775,7 +2833,7 @@ sysv4 | sysv4.3*) sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -2806,7 +2864,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2816,7 +2874,7 @@ tpf*) ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -3238,7 +3296,7 @@ irix5* | irix6* | nonstopux*) lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -3658,6 +3716,7 @@ for ac_symprfx in "" "_"; do # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -4242,7 +4301,9 @@ m4_if([$1], [CXX], [ case $cc_basename in nvcc*) # Cuda Compiler Driver 2.2 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC' + if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" + fi ;; esac else @@ -4334,18 +4395,33 @@ m4_if([$1], [CXX], [ ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ F* | *Sun*Fortran*) + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_TAGVAR(lt_prog_compiler_wl, $1)='' ;; + *Sun\ F* | *Sun*Fortran*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; *Sun\ C*) # Sun C 5.9 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ;; + *Intel*\ [[CF]]*Compiler*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + *Portland\ Group*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; esac ;; esac @@ -4505,7 +4581,9 @@ m4_if([$1], [CXX], [ ;; cygwin* | mingw* | cegcc*) case $cc_basename in - cl*) ;; + cl*) + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] @@ -4533,7 +4611,6 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -4787,8 +4864,7 @@ _LT_EOF xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ @@ -5084,6 +5160,7 @@ _LT_EOF # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' # Don't use ranlib _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' @@ -5130,10 +5207,6 @@ _LT_EOF _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ;; - freebsd1*) - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -5146,7 +5219,7 @@ _LT_EOF ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) + freebsd2.*) _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_minus_L, $1)=yes @@ -5185,7 +5258,6 @@ _LT_EOF fi if test "$with_gnu_ld" = no; then _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes @@ -5627,9 +5699,6 @@ _LT_TAGDECL([], [no_undefined_flag], [1], _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], [Flag to hardcode $libdir into a binary during linking. This must work even if $libdir does not exist]) -_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], - [[If ld is used when linking, flag to hardcode $libdir into a binary - during linking. This must work even if $libdir does not exist]]) _LT_TAGDECL([], [hardcode_libdir_separator], [1], [Whether we need a single "-rpath" flag with a separated argument]) _LT_TAGDECL([], [hardcode_direct], [0], @@ -5787,7 +5856,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)= _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -6157,7 +6225,7 @@ if test "$_lt_caught_CXX_error" != yes; then esac ;; - freebsd[[12]]*) + freebsd2.*) # C++ shared libraries reported to be fairly broken before # switch to ELF _LT_TAGVAR(ld_shlibs, $1)=no @@ -6918,12 +6986,18 @@ public class foo { } }; _LT_EOF +], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF +package foo +func foo() { +} +_LT_EOF ]) _lt_libdeps_save_CFLAGS=$CFLAGS case "$CC $CFLAGS " in #( *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; +*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; esac dnl Parse the compiler output and extract the necessary @@ -7120,7 +7194,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)= _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=no @@ -7253,7 +7326,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)= _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=no @@ -7440,6 +7512,77 @@ CFLAGS=$lt_save_CFLAGS ])# _LT_LANG_GCJ_CONFIG +# _LT_LANG_GO_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for the GNU Go compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_GO_CONFIG], +[AC_REQUIRE([LT_PROG_GO])dnl +AC_LANG_SAVE + +# Source file extension for Go test sources. +ac_ext=go + +# Object file extension for compiled Go test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="package main; func main() { }" + +# Code to be used in simple link tests +lt_simple_link_test_code='package main; func main() { }' + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +# Allow CC to be a program name with arguments. +lt_save_CC=$CC +lt_save_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC=yes +CC=${GOC-"gccgo"} +CFLAGS=$GOFLAGS +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_TAGVAR(LD, $1)="$LD" +_LT_CC_BASENAME([$compiler]) + +# Go did not exist at the time GCC didn't implicitly link libc in. +_LT_TAGVAR(archive_cmds_need_lc, $1)=no + +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds + +## CAVEAT EMPTOR: +## There is no encapsulation within the following macros, do not change +## the running order or otherwise move them around unless you know exactly +## what you are doing... +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) +fi + +AC_LANG_RESTORE + +GCC=$lt_save_GCC +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_GO_CONFIG + + # _LT_LANG_RC_CONFIG([TAG]) # ------------------------- # Ensure that the configuration variables for the Windows resource compiler @@ -7509,6 +7652,13 @@ dnl aclocal-1.4 backwards compatibility: dnl AC_DEFUN([LT_AC_PROG_GCJ], []) +# LT_PROG_GO +# ---------- +AC_DEFUN([LT_PROG_GO], +[AC_CHECK_TOOL(GOC, gccgo,) +]) + + # LT_PROG_RC # ---------- AC_DEFUN([LT_PROG_RC], diff --git a/macros/ltmain.sh b/macros/ltmain.sh old mode 100755 new mode 100644 index b4a3231..c2852d8 --- a/macros/ltmain.sh +++ b/macros/ltmain.sh @@ -1,9 +1,9 @@ -# libtool (GNU libtool) 2.4 +# libtool (GNU libtool) 2.4.2 # Written by Gordon Matzigkeit , 1996 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -41,6 +41,7 @@ # --quiet, --silent don't print informational messages # --no-quiet, --no-silent # print informational messages (default) +# --no-warn don't display warning messages # --tag=TAG use configuration variables from tag TAG # -v, --verbose print more informational messages than default # --no-verbose don't print the extra informational messages @@ -69,7 +70,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4 Debian-2.4-2ubuntu1 +# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu1 # automake: $automake_version # autoconf: $autoconf_version # @@ -79,9 +80,9 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4 Debian-2.4-2ubuntu1" +VERSION="2.4.2 Debian-2.4.2-1ubuntu1" TIMESTAMP="" -package_revision=1.3293 +package_revision=1.3337 # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -136,15 +137,10 @@ progpath="$0" : ${CP="cp -f"} test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} -: ${EGREP="/bin/grep -E"} -: ${FGREP="/bin/grep -F"} -: ${GREP="/bin/grep"} -: ${LN_S="ln -s"} : ${MAKE="make"} : ${MKDIR="mkdir"} : ${MV="mv -f"} : ${RM="rm -f"} -: ${SED="/bin/sed"} : ${SHELL="${CONFIG_SHELL-/bin/sh}"} : ${Xsed="$SED -e 1s/^X//"} @@ -387,7 +383,7 @@ case $progpath in ;; *) save_IFS="$IFS" - IFS=: + IFS=${PATH_SEPARATOR-:} for progdir in $PATH; do IFS="$save_IFS" test -x "$progdir/$progname" && break @@ -771,8 +767,8 @@ func_help () s*\$LTCFLAGS*'"$LTCFLAGS"'* s*\$LD*'"$LD"'* s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ + s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ + s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ p d } @@ -1052,6 +1048,7 @@ opt_finish=false opt_help=false opt_help_all=false opt_silent=: +opt_warning=: opt_verbose=: opt_silent=false opt_verbose=false @@ -1120,6 +1117,10 @@ esac opt_silent=false func_append preserve_args " $opt" ;; + --no-warning|--no-warn) + opt_warning=false +func_append preserve_args " $opt" + ;; --no-verbose) opt_verbose=false func_append preserve_args " $opt" @@ -2059,7 +2060,7 @@ func_mode_compile () *.[cCFSifmso] | \ *.ada | *.adb | *.ads | *.asm | \ *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ - *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup) + *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup) func_xform "$libobj" libobj=$func_xform_result ;; @@ -3201,11 +3202,13 @@ func_mode_install () # Set up the ranlib parameters. oldlib="$destdir/$name" + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result func_show_eval "$install_prog \$file \$oldlib" 'exit $?' if test -n "$stripme" && test -n "$old_striplib"; then - func_show_eval "$old_striplib $oldlib" 'exit $?' + func_show_eval "$old_striplib $tool_oldlib" 'exit $?' fi # Do each command in the postinstall commands. @@ -3470,7 +3473,7 @@ static const void *lt_preloaded_setup() { # linked before any other PIC object. But we must not use # pic_flag when linking with -static. The problem exists in # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. - *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) + *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; *-*-hpux*) pic_flag_for_symtable=" $pic_flag" ;; @@ -3982,14 +3985,17 @@ func_exec_program_core () # launches target application with the remaining arguments. func_exec_program () { - for lt_wr_arg - do - case \$lt_wr_arg in - --lt-*) ;; - *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; - esac - shift - done + case \" \$* \" in + *\\ --lt-*) + for lt_wr_arg + do + case \$lt_wr_arg in + --lt-*) ;; + *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; + esac + shift + done ;; + esac func_exec_program_core \${1+\"\$@\"} } @@ -5057,9 +5063,15 @@ void lt_dump_script (FILE* f) { EOF func_emit_wrapper yes | - $SED -e 's/\([\\"]\)/\\\1/g' \ - -e 's/^/ fputs ("/' -e 's/$/\\n", f);/' - + $SED -n -e ' +s/^\(.\{79\}\)\(..*\)/\1\ +\2/ +h +s/\([\\"]\)/\\\1/g +s/$/\\n/ +s/\([^\n]*\).*/ fputs ("\1", f);/p +g +D' cat <<"EOF" } EOF @@ -5643,7 +5655,8 @@ func_mode_link () continue ;; - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) func_append compiler_flags " $arg" func_append compile_command " $arg" func_append finalize_command " $arg" @@ -6150,7 +6163,8 @@ func_mode_link () lib= found=no case $deplib in - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) if test "$linkmode,$pass" = "prog,link"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" @@ -6834,7 +6848,7 @@ func_mode_link () test "$hardcode_direct_absolute" = no; then add="$dir/$linklib" elif test "$hardcode_minus_L" = yes; then - add_dir="-L$dir" + add_dir="-L$absdir" # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in @@ -7319,6 +7333,7 @@ func_mode_link () # which has an extra 1 added just for fun # case $version_type in + # correct linux to gnu/linux during the next big refactor darwin|linux|osf|windows|none) func_arith $number_major + $number_minor current=$func_arith_result @@ -7438,7 +7453,7 @@ func_mode_link () versuffix="$major.$revision" ;; - linux) + linux) # correct to gnu/linux during the next big refactor func_arith $current - $age major=.$func_arith_result versuffix="$major.$age.$revision" @@ -8026,6 +8041,11 @@ EOF # Test again, we may have decided not to build it any more if test "$build_libtool_libs" = yes; then + # Remove ${wl} instances when linking with ld. + # FIXME: should test the right _cmds variable. + case $archive_cmds in + *\$LD\ *) wl= ;; + esac if test "$hardcode_into_libs" = yes; then # Hardcode the library paths hardcode_libdirs= @@ -8056,7 +8076,7 @@ EOF elif test -n "$runpath_var"; then case "$perm_rpath " in *" $libdir "*) ;; - *) func_apped perm_rpath " $libdir" ;; + *) func_append perm_rpath " $libdir" ;; esac fi done @@ -8064,11 +8084,7 @@ EOF if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then libdir="$hardcode_libdirs" - if test -n "$hardcode_libdir_flag_spec_ld"; then - eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" - else - eval dep_rpath=\"$hardcode_libdir_flag_spec\" - fi + eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" fi if test -n "$runpath_var" && test -n "$perm_rpath"; then # We should set the runpath_var. @@ -9158,6 +9174,8 @@ EOF esac done fi + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result eval cmds=\"$old_archive_cmds\" func_len " $cmds" @@ -9267,7 +9285,8 @@ EOF *.la) func_basename "$deplib" name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + func_resolve_sysroot "$deplib" + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` test -z "$libdir" && \ func_fatal_error "\`$deplib' is not a valid libtool archive" func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" diff --git a/macros/ltoptions.m4 b/macros/ltoptions.m4 index 17cfd51..5d9acd8 100644 --- a/macros/ltoptions.m4 +++ b/macros/ltoptions.m4 @@ -326,9 +326,24 @@ dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) # MODE is either `yes' or `no'. If omitted, it defaults to `both'. m4_define([_LT_WITH_PIC], [AC_ARG_WITH([pic], - [AS_HELP_STRING([--with-pic], + [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [pic_mode="$withval"], + [lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], [pic_mode=default]) test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) diff --git a/macros/ltversion.m4 b/macros/ltversion.m4 index 9c7b5d4..07a8602 100644 --- a/macros/ltversion.m4 +++ b/macros/ltversion.m4 @@ -9,15 +9,15 @@ # @configure_input@ -# serial 3293 ltversion.m4 +# serial 3337 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4]) -m4_define([LT_PACKAGE_REVISION], [1.3293]) +m4_define([LT_PACKAGE_VERSION], [2.4.2]) +m4_define([LT_PACKAGE_REVISION], [1.3337]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4' -macro_revision='1.3293' +[macro_version='2.4.2' +macro_revision='1.3337' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff --git a/macros/missing b/macros/missing index 28055d2..86a8fc3 100755 --- a/macros/missing +++ b/macros/missing @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-01-06.13; # UTC # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. +# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -84,7 +84,6 @@ Supported PROGRAM values: help2man touch the output file lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and @@ -122,15 +121,6 @@ case $1 in # Not GNU programs, they don't have --version. ;; - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. @@ -226,7 +216,7 @@ WARNING: \`$1' $msg. You should only need it if \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` @@ -256,7 +246,7 @@ WARNING: \`$1' is $msg. You should only need it if \`Flex' from any GNU archive site." rm -f lex.yy.c if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` @@ -318,41 +308,6 @@ WARNING: \`$1' is $msg. You should only need it if touch $file ;; - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - *) echo 1>&2 "\ WARNING: \`$1' is needed, and is $msg. diff --git a/macros/reduced.m4 b/macros/reduced.m4 deleted file mode 100644 index b34495e..0000000 --- a/macros/reduced.m4 +++ /dev/null @@ -1,20 +0,0 @@ -## LIBXMLCPP_ARG_ENABLE_API_EXCEPTIONS() -## -## Provide the --enable-api-exceptions configure argument, enabled -## by default. -## -AC_DEFUN([LIBXMLCPP_ARG_ENABLE_API_EXCEPTIONS], -[ - AC_ARG_ENABLE([api-exceptions], - [ --enable-api-exceptions Build exceptions API. - [[default=yes]]], - [libxmlcpp_enable_api_exceptions="$enableval"], - [libxmlcpp_enable_api_exceptions='yes']) - - if test "x$libxmlcpp_enable_api_exceptions" = "xyes"; then - { - AC_DEFINE([LIBXMLCPP_EXCEPTIONS_ENABLED],[1], [Defined when the --enable-api-exceptions configure argument was given]) - } - fi -]) -
xmlpp::SaxParser::AttributeHasName::AttributeHasName xmlpp::SaxParser::AttributeHasName::AttributeHasName ( Glib::ustring const &  n)