- expressions can now be read from streams; the input expression can contain

[ginac.git] / ginac / fail.cpp

diff --git a/ginac/fail.cpp b/ginac/fail.cpp
index 9e8d8a6a52fe26a6098450a9fd5bc498fad15cb5..d35c2f43e7b81a0ed646545b9842840f2363a4d0 100644 (file)
--- a/ginac/fail.cpp
+++ b/ginac/fail.cpp
@@ -25,9 +25,9 @@
 #include "archive.h"
 #include "debugmsg.h"
 
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC
 
 GINAC_IMPLEMENT_REGISTERED_CLASS(fail, basic)
 
@@ -48,13 +48,13 @@ fail::~fail()
     destroy(0);
 }
 
-fail::fail(fail const & other)
+fail::fail(const fail & other)
 {
     debugmsg("fail copy constructor",LOGLEVEL_CONSTRUCT);
     copy(other);
 }
 
-fail const & fail::operator=(fail const & other)
+const fail & fail::operator=(const fail & other)
 {
     debugmsg("fail operator=",LOGLEVEL_ASSIGNMENT);
     if (this != &other) {
@@ -66,7 +66,7 @@ fail const & fail::operator=(fail const & other)
 
 // protected
 
-void fail::copy(fail const & other)
+void fail::copy(const fail & other)
 {
     inherited::copy(other);
 }
@@ -131,7 +131,7 @@ void fail::printraw(ostream & os) const
 
 // protected
 
-int fail::compare_same_type(basic const & other) const
+int fail::compare_same_type(const basic & other) const
 {
        // two fails are always identical
     return 0;
@@ -160,8 +160,8 @@ int fail::compare_same_type(basic const & other) const
 //////////
 
 const fail some_fail;
-type_info const & typeid_fail=typeid(some_fail);
+const type_info & typeid_fail=typeid(some_fail);
 
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC