more modifications for future cints with correct namespace handling

diff --git a/cint/dummies.cpp b/cint/dummies.cpp
index 66d57d9ae5ea23adf7808951f860fa235cc9c56c..85b6fbfad33b0dfcba10f6a1bc67f6b261146c75 100644 (file)
--- a/cint/dummies.cpp
+++ b/cint/dummies.cpp
@@ -8,7 +8,12 @@
 #include <ginac/function.h>
 
 #ifndef NO_NAMESPACE_GINAC
-using namespace GiNaC;
+namespace GiNaC {
 #endif // ndef NO_NAMESPACE_GINAC
 
 void ginsh_get_ginac_functions(void) { }
+
+#ifndef NO_NAMESPACE_GINAC
+}
+#endif // ndef NO_NAMESPACE_GINAC
+

diff --git a/cint/dummies.pl b/cint/dummies.pl
index 0bb469628a0fa913f720a4f3a7def912cedccd9f..4da0b81277844ceac9ace599852e51939187770e 100644 (file)
--- a/cint/dummies.pl
+++ b/cint/dummies.pl
@@ -224,7 +224,7 @@ $opening=<<END_OF_OPENING;
 #include <ginac/function.h>
 
 #ifndef NO_NAMESPACE_GINAC
-using namespace GiNaC;
+namespace GiNaC {
 #endif // ndef NO_NAMESPACE_GINAC
 
 END_OF_OPENING
@@ -232,6 +232,16 @@ END_OF_OPENING
 print OUT $opening;
 print OUT "void ginsh_get_ginac_functions(void) { }\n";
 
+$closing=<<END_OF_CLOSING;
+
+#ifndef NO_NAMESPACE_GINAC
+}
+#endif // ndef NO_NAMESPACE_GINAC
+
+END_OF_CLOSING
+
+print OUT $closing;
+
 close OUT;
 
 # Create dummies