[C++20] Clean up using-declarations.

[ginac.git] / ginsh / ginsh.h

diff --git a/ginsh/ginsh.h b/ginsh/ginsh.h
index ffaf4e0da1b6d87f62415ec186f528ba461dbced..973c6f0d9fb73bd1491025a6d50b2a506a11931e 100644 (file)
--- a/ginsh/ginsh.h
+++ b/ginsh/ginsh.h
@@ -29,8 +29,6 @@
 #include <iostream>
 #include <string>
 
 #include <iostream>
 #include <string>
 

-using namespace std;
-

 #ifdef HAVE_READLINE_READLINE_H
 extern "C" {
 #include <readline/readline.h>
 #ifdef HAVE_READLINE_READLINE_H
 extern "C" {
 #include <readline/readline.h>


@@ -49,10 +47,8 @@ extern "C" {
 #include <ginac/ginac.h>
 #endif
 
 #include <ginac/ginac.h>
 #endif
 

-using namespace GiNaC;
-

 // yacc stack type
 // yacc stack type

-#define YYSTYPE ex
+#define YYSTYPE GiNaC::ex

 
 // lex functions/variables
 extern int yyerror(const char *s);
 
 // lex functions/variables
 extern int yyerror(const char *s);


@@ -65,7 +61,7 @@ extern int num_files;
 extern char **file_list;
 
 // Table of all used symbols
 extern char **file_list;
 
 // Table of all used symbols

-typedef map<string, ex> sym_tab;
+typedef std::map<std::string, GiNaC::ex> sym_tab;

 extern sym_tab syms;
 
 // Type of symbols to generate (real or complex)
 extern sym_tab syms;
 
 // Type of symbols to generate (real or complex)