- Fixed a thinko in atan(const numeric &).

[ginac.git] / ginac / coloridx.h

diff --git a/ginac/coloridx.h b/ginac/coloridx.h
index 266dcf9276be0c25852b91b71462b0d7ed1d526b..5031e323562cec562e39da6b01eb19ae788979fa 100644 (file)
--- a/ginac/coloridx.h
+++ b/ginac/coloridx.h
@@ -25,12 +25,12 @@
 
 #include <string>
 #include <vector>
-#include <ginac/idx.h>
-#include <ginac/ex.h>
+#include "idx.h"
+#include "ex.h"
 
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC
 
 class coloridx : public idx
 {
@@ -53,16 +53,16 @@ protected:
     // other constructors
 public:
     explicit coloridx(bool cov);
-    explicit coloridx(const string & n, bool cov=false);
+    explicit coloridx(const std::string & n, bool cov=false);
     explicit coloridx(const char * n, bool cov=false);
     explicit coloridx(unsigned v, bool cov=false); 
 
     // functions overriding virtual functions from bases classes
 public:
     basic * duplicate() const;
-    void printraw(ostream & os) const;
-    void printtree(ostream & os, unsigned indent) const;
-    void print(ostream & os, unsigned upper_precedence=0) const;
+    void printraw(std::ostream & os) const;
+    void printtree(std::ostream & os, unsigned indent) const;
+    void print(std::ostream & os, unsigned upper_precedence=0) const;
     bool info(unsigned inf) const;
 
     // new virtual functions which can be overridden by derived classes
@@ -86,8 +86,8 @@ inline const coloridx &ex_to_coloridx(const ex &e)
        return static_cast<const coloridx &>(*e.bp);
 }
 
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_COLORIDX_H__