* created a separate namespace for DOM extensions

diff --git a/helm/DEVEL/gdome_xslt/C++/gdome_xslt/GdomeSmartDOMXSLTStylesheet.cc b/helm/DEVEL/gdome_xslt/C++/gdome_xslt/GdomeSmartDOMXSLTStylesheet.cc
index 2bc2ce76f120d222922742676b0298532ed5d157..ab71b0468dc7956e0f00de33412855e93e1f2a9c 100644 (file)
--- 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 57cf55bfc94f810bf18ba753f56f8676056d438f..4306640dc5603d258c07c626aa29d858b0de1cf8 100644 (file)
--- 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 <GdomeSmartDOM.hh>
 
-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 f7225e93d717eebb0f6fe33b87a6c93862c4da49..0f5aa2d70f27c36d4dda7af36720e09bc66a10bb 100644 (file)
--- 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 0ee2da361c15d1a2e195e541efcae1a72b329093..5cfa88f499a060be498c8d080565e752990cf90a 100644 (file)
--- 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 c711e9f825bdea10f3d654ebd24c01c8f88bd86e..cc6b8f6e4bd313da7c0b72fc5e57ac1f46c0f9d8 100644 (file)
--- 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
+