* Macro deobfuscation.

diff --git a/cint/ginaccint.bin.cpp b/cint/ginaccint.bin.cpp
index edb0e806a6cb816220e64d78c6e2513b91a083a3..0c2c0d53deb287b66ff940923b793debdc8119e3 100644 (file)
--- a/cint/ginaccint.bin.cpp
+++ b/cint/ginaccint.bin.cpp
@@ -16,9 +16,7 @@
 #include "config.h"
 #include <list>
 
-#ifndef NO_NAMESPACE_GINAC
 using namespace GiNaC;
-#endif // ndef NO_NAMESPACE_GINAC
 
 extern "C" G__value G__exec_tempfile G__P((char *file));
 extern "C" void G__store_undo_position(void);
@@ -348,12 +346,9 @@ void initialize_cint(void)
 {
        G__init_cint("cint");    /* initialize cint */
        
-#ifndef NO_NAMESPACE_GINAC
        exec_tempfile("using namespace GiNaC;");
-#endif // ndef NO_NAMESPACE_GINAC
-       
        exec_tempfile("ex LAST,LLAST,LLLAST;\n");
-       exec_tempfile("bool ginac_cint_internal_redirect_output=false;\n");
+       exec_tempfile("bool ginac_cint_internal_redirect_output = false;\n");
        exec_tempfile("ofstream ginac_cint_internal_fout;\n");
 }    
 

diff --git a/ginsh/ginsh.h b/ginsh/ginsh.h
index 2d3fa32d52b9f4df0a88f62cd3fa3192406cbc21..cf2a5827754c1e75145e23338559ad0d351f0e07 100644 (file)
--- a/ginsh/ginsh.h
+++ b/ginsh/ginsh.h
@@ -49,9 +49,7 @@ extern "C" {
 #include <ginac/ginac.h>
 #endif
 
-#ifndef NO_NAMESPACE_GINAC
 using namespace GiNaC;
-#endif // ndef NO_NAMESPACE_GINAC
 
 // yacc stack type
 #define YYSTYPE ex

diff --git a/ginsh/ginsh_parser.yy b/ginsh/ginsh_parser.yy
index 62418496f28e10f3728dfa28f37e0ea4d470f0dd..a83bbc32a444ecbd7ee0cede115558c16876b95f 100644 (file)
--- a/ginsh/ginsh_parser.yy
+++ b/ginsh/ginsh_parser.yy
@@ -566,11 +566,7 @@ static ex f_ginac_function(const exprseq &es, int serial)
 }
 
 // All registered GiNaC functions
-#ifndef NO_NAMESPACE_GINAC
 void GiNaC::ginsh_get_ginac_functions(void)
-#else // ndef NO_NAMESPACE_GINAC
-void ginsh_get_ginac_functions(void)
-#endif // ndef NO_NAMESPACE_GINAC
 {
        vector<function_options>::const_iterator i = function::registered_functions().begin(), end = function::registered_functions().end();
        unsigned serial = 0;

diff --git a/tools/viewgar.cpp b/tools/viewgar.cpp
index e90f20690e2edd2c715f4b10a55f1db6d3e22e0a..19f27df149762da615bcf25a5743feca05015f1e 100644 (file)
--- a/tools/viewgar.cpp
+++ b/tools/viewgar.cpp
@@ -27,9 +27,7 @@
 
 #include "ginac.h"
 
-#ifndef NO_NAMESPACE_GINAC
 using namespace GiNaC;
-#endif // ndef NO_NAMESPACE_GINAC
 
 int main(int argc, char **argv)
 {