- Changes to make it more ANSI-conformant. Stuff detected while trying

[ginac.git] / ginac / fail.h

diff --git a/ginac/fail.h b/ginac/fail.h
index aa207d4dd254a6278b8bfa090b22864c6f8e2e24..c7a80a7e22cf54ac4aef3fdc31aca6cdf2d66811 100644 (file)
--- a/ginac/fail.h
+++ b/ginac/fail.h
@@ -24,43 +24,43 @@
 #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
 {
-    GINAC_DECLARE_REGISTERED_CLASS(fail, basic)
+       GINAC_DECLARE_REGISTERED_CLASS(fail, basic)
 
-    // default constructor, destructor, copy constructor assignment operator and helpers
+       // default constructor, destructor, copy constructor assignment operator and helpers
 public:
-    fail();
-    ~fail();
-    fail(fail const & other);
-    fail const & operator=(fail const & other);
+       fail();
+       ~fail();
+       fail(const fail & other);
+       const fail & operator=(const fail & other);
 protected:
-    void copy(fail const & other);
-    void destroy(bool call_parent);
+       void copy(const fail & other);
+       void destroy(bool call_parent);
 
-    // other constructors
-    // none
+       // other constructors
+       // none
 
-    // functions overriding virtual functions from bases classes
+       // functions overriding virtual functions from bases classes
 public:
-    basic * duplicate() const;
-    void print(ostream & os, unsigned upper_precedence=0) const;
-    void printraw(ostream & os) const;
+       basic * duplicate() const;
+       void print(std::ostream & os, unsigned upper_precedence=0) const;
+       void printraw(std::ostream & os) const;
 protected:
-    int compare_same_type(basic const & other) const;
-    unsigned return_type(void) const { return return_types::noncommutative_composite; };
-    
-    // new virtual functions which can be overridden by derived classes
-    // none
+       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
+       // none
 
-    // non-virtual functions in this class
-    // none
+       // non-virtual functions in this class
+       // none
 
 // member variables
 // none
@@ -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__