- Banned exZERO(), exONE(), exMINUSHALF() and all this from the interface.

[ginac.git] / ginac / operators.h

diff --git a/ginac/operators.h b/ginac/operators.h
index 4c95a55164a81adf4b7c67325a009b3361b74346..a60da5d632f38ee7bc037c3bbe9b85771d2f5387 100644 (file)
--- a/ginac/operators.h
+++ b/ginac/operators.h
@@ -25,7 +25,9 @@
 
 #include <iostream>
 
+#ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {
+#endif // ndef NO_GINAC_NAMESPACE
 
 class ex;
 class numeric;
@@ -38,24 +40,6 @@ ex operator*(ex const & lh, ex const & rh);
 ex operator/(ex const & lh, ex const & rh);
 ex operator%(ex const & lh, ex const & rh); // non-commutative multiplication
 
-/*
-
-// binary arithmetic operators ex with numeric
-ex operator+(ex const & lh, numeric const & rh);
-ex operator-(ex const & lh, numeric const & rh);
-ex operator*(ex const & lh, numeric const & rh);
-ex operator/(ex const & lh, numeric const & rh);
-ex operator%(ex const & lh, numeric const & rh); // non-commutative multiplication
-
-// binary arithmetic operators numeric with ex
-ex operator+(numeric const & lh, ex const & rh);
-ex operator-(numeric const & lh, ex const & rh);
-ex operator*(numeric const & lh, ex const & rh);
-ex operator/(numeric const & lh, ex const & rh);
-ex operator%(numeric const & lh, ex const & rh); // non-commutative multiplication
-
-*/
-
 // binary arithmetic operators numeric with numeric
 numeric operator+(numeric const & lh, numeric const & rh);
 numeric operator-(numeric const & lh, numeric const & rh);
@@ -69,17 +53,6 @@ ex const & operator*=(ex & lh, ex const & rh);
 ex const & operator/=(ex & lh, ex const & rh);
 ex const & operator%=(ex & lh, ex const & rh); // non-commutative multiplication
 
-/*
-  
-// binary arithmetic assignment operators with numeric
-ex const & operator+=(ex & lh, numeric const & rh);
-ex const & operator-=(ex & lh, numeric const & rh);
-ex const & operator*=(ex & lh, numeric const & rh);
-ex const & operator/=(ex & lh, numeric const & rh);
-ex const & operator%=(ex & lh, numeric const & rh); // non-commutative multiplication
-
-*/
-
 // binary arithmetic assignment operators with numeric
 numeric const & operator+=(numeric & lh, numeric const & rh);
 numeric const & operator-=(numeric & lh, numeric const & rh);
@@ -92,6 +65,10 @@ ex operator-(ex const & lh);
 
 numeric operator+(numeric const & lh);
 numeric operator-(numeric const & lh);
+numeric& operator++(numeric & rh);
+numeric& operator--(numeric & rh);
+numeric operator++(numeric & lh, int);
+numeric operator--(numeric & lh, int);
 
 // binary relational operators ex with ex
 relational operator==(ex const & lh, ex const & rh);
@@ -101,30 +78,12 @@ relational operator<=(ex const & lh, ex const & rh);
 relational operator>(ex const & lh, ex const & rh);
 relational operator>=(ex const & lh, ex const & rh);
 
-/*
-
-// binary relational operators ex with numeric
-relational operator==(ex const & lh, numeric const & rh);
-relational operator!=(ex const & lh, numeric const & rh);
-relational operator<(ex const & lh, numeric const & rh);
-relational operator<=(ex const & lh, numeric const & rh);
-relational operator>(ex const & lh, numeric const & rh);
-relational operator>=(ex const & lh, numeric const & rh);
-
-// binary relational operators numeric with ex
-relational operator==(numeric const & lh, ex const & rh);
-relational operator!=(numeric const & lh, ex const & rh);
-relational operator<(numeric const & lh, ex const & rh);
-relational operator<=(numeric const & lh, ex const & rh);
-relational operator>(numeric const & lh, ex const & rh);
-relational operator>=(numeric const & lh, ex const & rh);
-
-*/
-
 // input/output stream operators
 ostream & operator<<(ostream & os, ex const & e);
 istream & operator>>(istream & is, ex & e);
 
+#ifndef NO_GINAC_NAMESPACE
 } // namespace GiNaC
+#endif // ndef NO_GINAC_NAMESPACE
 
 #endif // ndef __GINAC_OPERATORS_H__