- inserted a couple of missing namepace std:: resolutions.

[ginac.git] / ginac / relational.h

diff --git a/ginac/relational.h b/ginac/relational.h
index c988a631f2e59fad825badbeee29e62073f0d905..8f4efed9ad555d9fc402a7c125cd12e685695b24 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,18 +45,18 @@ 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:
-       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);
+       ex map(map_func f) const;
        ex eval(int level=0) const;
        ex evalf(int level=0) const;
        ex normal(lst &sym_lst, lst &repl_lst, int level=0) const;
@@ -82,7 +80,6 @@ protected:
        ex lh;
        ex rh;
        operators o;
-       static unsigned precedence;
 };
 
 // utility functions
@@ -91,8 +88,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__