X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fregistrar.cpp;h=2488be5509f2e782d3ad85ac95e99c0d94b2280e;hp=fc54830230016f1e4146656ae9e0155033124cb1;hb=8493b91ebc3b9f748dc663ac12239e9ce0fa5b26;hpb=0a1b35cf1e59c9e3aae33de8febaa1c8f4bbe630

diff --git a/ginac/registrar.cpp b/ginac/registrar.cpp
index fc548302..2488be55 100644
--- a/ginac/registrar.cpp
+++ b/ginac/registrar.cpp
@@ -25,14 +25,14 @@
 
 #include "registrar.h"
 
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC
 
 registered_class_info *first_registered_class = NULL;
 
 /** Find registered_class_info strucure by class name. */
-static inline registered_class_info *find_registered_class_info(const string &class_name)
+static inline registered_class_info *find_registered_class_info(const std::string &class_name)
 {
 	registered_class_info *p = first_registered_class;
 	while (p) {
@@ -43,19 +43,19 @@ static inline registered_class_info *find_registered_class_info(const string &cl
 	throw (std::runtime_error("class '" + class_name + "' not registered"));
 }
 
-unsigned int find_tinfo_key(const string &class_name)
+unsigned int find_tinfo_key(const std::string &class_name)
 {
 	registered_class_info *p = find_registered_class_info(class_name);
 	return p->tinfo_key;
 }
 
-unarch_func find_unarch_func(const string &class_name)
+unarch_func find_unarch_func(const std::string &class_name)
 {
 	registered_class_info *p = find_registered_class_info(class_name);
 	return p->unarchive;
 }
 
 
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC