mentioned ncpow()

[ginac.git] / ginac / relational.h

diff --git a/ginac/relational.h b/ginac/relational.h
index 5a9fe443164d9d9120210905ad1b665e2cd22e47..c3b223b5eb0f494f722ffc25f20a10ce72de5431 100644 (file)
--- a/ginac/relational.h
+++ b/ginac/relational.h
@@ -26,9 +26,7 @@
 #include "basic.h"
 #include "ex.h"
 
-#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_NAMESPACE_GINAC
 
 /** This class holds a relation consisting of two expressions and a logical
  *  relation between them. */
@@ -47,16 +45,14 @@ public:
                greater_or_equal
        };
        
-       // other constructors
+       // other ctors
 public:
        relational(const ex & lhs, const ex & rhs, operators oper=equal);
        
        // functions overriding virtual functions from bases classes
 public:
-       basic * duplicate() const;
-       void print(std::ostream & os, unsigned upper_precedence=0) const;
-       void printraw(std::ostream & os) const;
-       void printcsrc(std::ostream & os, unsigned type, unsigned upper_precedence=0) const;
+       void print(const print_context & c, unsigned level = 0) const;
+       unsigned precedence(void) const {return 20;}
        bool info(unsigned inf) const;
        unsigned nops() const;
        ex & let_op(int i);
@@ -65,7 +61,6 @@ public:
        ex normal(lst &sym_lst, lst &repl_lst, int level=0) const;
        ex simplify_ncmul(const exvector & v) const;
 protected:
-       int compare_same_type(const basic & other) const;
        unsigned return_type(void) const;
        unsigned return_type_tinfo(void) const;
 
@@ -84,7 +79,6 @@ protected:
        ex lh;
        ex rh;
        operators o;
-       static unsigned precedence;
 };
 
 // utility functions
@@ -93,8 +87,6 @@ inline const relational &ex_to_relational(const ex &e)
        return static_cast<const relational &>(*e.bp);
 }
 
-#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_RELATIONAL_H__