X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fregistrar.cpp;h=9a747efff7fc83ce9c9dbfaf418745c66e49ccab;hp=f95b20131989c29e26b02366f1c8d62a67308665;hb=fbdd5eefb7188778ca9c04b5bee08223609b880f;hpb=956eeb82c513a723e864edefa857133282cf692b

diff --git a/ginac/registrar.cpp b/ginac/registrar.cpp
index f95b2013..9a747eff 100644
--- a/ginac/registrar.cpp
+++ b/ginac/registrar.cpp
@@ -3,7 +3,7 @@
  *  GiNaC's class registrar (for class basic and all classes derived from it). */
 
 /*
- *  GiNaC Copyright (C) 1999-2000 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -25,14 +25,12 @@
 
 #include "registrar.h"
 
-#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#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 +41,17 @@ 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_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC