- Import namespace std globally.

[ginac.git] / ginsh / ginsh.h

diff --git a/ginsh/ginsh.h b/ginsh/ginsh.h
index 735d4b96a3a4341610f3788f83135583dde0e31f..ddd83ea03cd2233ac33b102b8f9fa3f2cfba2904 100644 (file)
--- a/ginsh/ginsh.h
+++ b/ginsh/ginsh.h
@@ -29,6 +29,8 @@
 #include <map>
 #include <string>
 
+using namespace std;
+
 #ifdef HAVE_READLINE_READLINE_H
 extern "C" {
 #include <readline/readline.h>
@@ -41,11 +43,15 @@ extern "C" {
 }
 #endif
 
+#ifdef IN_GINAC
 #include "ginac.h"
+#else
+#include <ginac/ginac.h>
+#endif
 
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
 using namespace GiNaC;
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC
 
 // yacc stack type
 #define YYSTYPE ex