X-Git-Url: https://ginac.de/ginac.git//ginac.git?a=blobdiff_plain;ds=inline;f=ginac%2Frelational.h;h=dcbcacc5a30bc2e36d40cc99577bca749a844f1a;hb=85ce9664ddba79c28a6945b1e5b4e2b71f77cb51;hp=c1077f1506e71f67eea9292e5ce030e3a3a27638;hpb=9e2d60e206395fc9908e1f9025e50c76b3d7c182;p=ginac.git

diff --git a/ginac/relational.h b/ginac/relational.h
index c1077f15..dcbcacc5 100644
--- a/ginac/relational.h
+++ b/ginac/relational.h
@@ -3,7 +3,7 @@
  *  Interface to relations between expressions. */
 
 /*
- *  GiNaC Copyright (C) 1999-2000 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -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,28 +45,13 @@ public:
 		greater_or_equal
 	};
 	
-// member functions
-
-	// default constructor, destructor, copy constructor assignment operator and helpers
-public:
-	relational();
-	~relational();
-	relational(const relational & other);
-	const relational & operator=(const relational & other);
-protected:
-	void copy(const relational & other);
-	void destroy(bool call_parent);
-
-	// 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;
 	bool info(unsigned inf) const;
 	unsigned nops() const;
 	ex & let_op(int i);
@@ -77,7 +60,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;
 
@@ -99,19 +81,12 @@ protected:
 	static unsigned precedence;
 };
 
-// global constants
-
-extern const relational some_relational;
-extern const std::type_info & typeid_relational;
-
 // utility functions
 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__