From 3d86b8880cb167070cfb6b4a8d486d1beffe0100 Mon Sep 17 00:00:00 2001 From: Luca Padovani Date: Sat, 1 Feb 2003 17:49:39 +0000 Subject: [PATCH] * created a separate namespace for DOM extensions --- .../C++/gdome_xslt/GdomeSmartDOMXSLTStylesheet.cc | 2 +- .../C++/gdome_xslt/GdomeSmartDOMXSLTStylesheet.hh | 4 +++- helm/DEVEL/gdome_xslt/C++/test/main.cc | 3 ++- helm/DEVEL/gdome_xslt/Makefile.am | 5 ++++- helm/DEVEL/gdome_xslt/configure.ac | 11 ++++++----- 5 files changed, 16 insertions(+), 9 deletions(-) diff --git a/helm/DEVEL/gdome_xslt/C++/gdome_xslt/GdomeSmartDOMXSLTStylesheet.cc b/helm/DEVEL/gdome_xslt/C++/gdome_xslt/GdomeSmartDOMXSLTStylesheet.cc index 2bc2ce76f..ab71b0468 100644 --- a/helm/DEVEL/gdome_xslt/C++/gdome_xslt/GdomeSmartDOMXSLTStylesheet.cc +++ b/helm/DEVEL/gdome_xslt/C++/gdome_xslt/GdomeSmartDOMXSLTStylesheet.cc @@ -29,7 +29,7 @@ #include "GdomeSmartDOMXSLTStylesheet.hh" -namespace GdomeSmartDOM { +namespace GdomeSmartDOMExt { XSLTStylesheet::XSLTStylesheet(const Document& doc) { diff --git a/helm/DEVEL/gdome_xslt/C++/gdome_xslt/GdomeSmartDOMXSLTStylesheet.hh b/helm/DEVEL/gdome_xslt/C++/gdome_xslt/GdomeSmartDOMXSLTStylesheet.hh index 57cf55bfc..4306640dc 100644 --- a/helm/DEVEL/gdome_xslt/C++/gdome_xslt/GdomeSmartDOMXSLTStylesheet.hh +++ b/helm/DEVEL/gdome_xslt/C++/gdome_xslt/GdomeSmartDOMXSLTStylesheet.hh @@ -30,7 +30,9 @@ #include "gdome_xslt.h" #include -namespace GdomeSmartDOM { +namespace GdomeSmartDOMExt { + + using namespace GdomeSmartDOM; class XSLTStylesheet { diff --git a/helm/DEVEL/gdome_xslt/C++/test/main.cc b/helm/DEVEL/gdome_xslt/C++/test/main.cc index f7225e93d..0f5aa2d70 100644 --- a/helm/DEVEL/gdome_xslt/C++/test/main.cc +++ b/helm/DEVEL/gdome_xslt/C++/test/main.cc @@ -24,6 +24,7 @@ #include "GdomeSmartDOMXSLT.hh" namespace DOM = GdomeSmartDOM; +namespace DOMX = GdomeSmartDOMExt; #define OUTPUT_FILE "../../test_files/output.xml" #define CORRECT_OUTPUT_FILE "../../test_files/output.xml.correct" @@ -42,7 +43,7 @@ main(void) DOM::Document input = di.createDocumentFromURI("../../test_files/input.xml"); DOM::Document style = di.createDocumentFromURI("../../test_files/stylesheet.xsl"); - DOM::XSLTStylesheet style_libxslt(style); + DOMX::XSLTStylesheet style_libxslt(style); DOM::Document output = style_libxslt.apply(input, params); style_libxslt.save(output, OUTPUT_FILE); diff --git a/helm/DEVEL/gdome_xslt/Makefile.am b/helm/DEVEL/gdome_xslt/Makefile.am index 0ee2da361..5cfa88f49 100644 --- a/helm/DEVEL/gdome_xslt/Makefile.am +++ b/helm/DEVEL/gdome_xslt/Makefile.am @@ -2,7 +2,10 @@ DISTDIR = @PACKAGE@-@VERSION@ EXTRA_DIST = BUGS LICENSE aclocal.m4 debian/ -SUBDIRS = C C++ ocaml test_files +SUBDIRS = C C++ test_files +# SUBDIRS = C C++ ocaml test_files + +bin_SCRIPTS = gdome_xslt_cpp_smart-config deb: dist if [ -d $(DISTDIR)/ ]; then rm -rf $(DISTDIR); else true; fi diff --git a/helm/DEVEL/gdome_xslt/configure.ac b/helm/DEVEL/gdome_xslt/configure.ac index c711e9f82..cc6b8f6e4 100644 --- a/helm/DEVEL/gdome_xslt/configure.ac +++ b/helm/DEVEL/gdome_xslt/configure.ac @@ -193,11 +193,12 @@ AC_CONFIG_FILES([ C++/gdome_xslt/Makefile C++/test/Makefile C++/Makefile - ocaml/Makefile - ocaml/gdome_xslt/Makefile - ocaml/gdome_xslt/META - ocaml/test/Makefile - gdome_xslt_cpp_smart-config + gdome_xslt_cpp_smart-config test_files/Makefile]) AC_CONFIG_COMMANDS([default],[[chmod +x gdome_xslt_cpp_smart-config]],[[]]) AC_OUTPUT +# ocaml/Makefile +# ocaml/gdome_xslt/Makefile +# ocaml/gdome_xslt/META +# ocaml/test/Makefile + -- 2.39.2