- The status_flags::expanded is now used on some occasions.

[ginac.git] / ginac / fail.h

diff --git a/ginac/fail.h b/ginac/fail.h
index aa207d4dd254a6278b8bfa090b22864c6f8e2e24..9d87d1bcafa381b6c0001a59aefec0764cc27145 100644 (file)
--- a/ginac/fail.h
+++ b/ginac/fail.h
@@ -24,11 +24,11 @@
 #ifndef __GINAC_FAIL_H__
 #define __GINAC_FAIL_H__
 
-#include <ginac/basic.h>
+#include "basic.h"
 
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC
 
 class fail : public basic
 {
@@ -38,10 +38,10 @@ class fail : public basic
 public:
     fail();
     ~fail();
-    fail(fail const & other);
-    fail const & operator=(fail const & other);
+    fail(const fail & other);
+    const fail & operator=(const fail & other);
 protected:
-    void copy(fail const & other);
+    void copy(const fail & other);
     void destroy(bool call_parent);
 
     // other constructors
@@ -53,7 +53,7 @@ public:
     void print(ostream & os, unsigned upper_precedence=0) const;
     void printraw(ostream & os) const;
 protected:
-    int compare_same_type(basic const & other) const;
+    int compare_same_type(const basic & other) const;
     unsigned return_type(void) const { return return_types::noncommutative_composite; };
     
     // new virtual functions which can be overridden by derived classes
@@ -69,10 +69,10 @@ protected:
 // global constants
 
 extern const fail some_fail;
-extern type_info const & typeid_fail;
+extern const type_info & typeid_fail;
 
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_FAIL_H__