X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Foperators.h;h=47d1b745a3602aba91fda96b891cb337fc5ca5f2;hb=d508ca04e9c2f4ee103c9f21f33a98c87116df13;hp=33acabaeb52b986ce5ee76708ce07f580f34e722;hpb=2565309dd7c38635c191eacf2a4af9b23fc0d310;p=ginac.git

diff --git a/ginac/operators.h b/ginac/operators.h
index 33acabae..47d1b745 100644
--- a/ginac/operators.h
+++ b/ginac/operators.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's overloaded operators. */
 
 /*
- *  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
@@ -25,9 +25,7 @@
 
 #include <iostream>
 
-#ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {
-#endif // ndef NO_GINAC_NAMESPACE
 
 class ex;
 class numeric;
@@ -38,7 +36,6 @@ ex operator+(const ex & lh, const ex & rh);
 ex operator-(const ex & lh, const ex & rh);
 ex operator*(const ex & lh, const ex & rh);
 ex operator/(const ex & lh, const ex & rh);
-ex operator%(const ex & lh, const ex & rh); // non-commutative multiplication
 
 // binary arithmetic operators numeric with numeric
 numeric operator+(const numeric & lh, const numeric & rh);
@@ -51,7 +48,6 @@ const ex & operator+=(ex & lh, const ex & rh);
 const ex & operator-=(ex & lh, const ex & rh);
 const ex & operator*=(ex & lh, const ex & rh);
 const ex & operator/=(ex & lh, const ex & rh);
-const ex & operator%=(ex & lh, const ex & rh); // non-commutative multiplication
 
 // binary arithmetic assignment operators with numeric
 const numeric & operator+=(numeric & lh, const numeric & rh);
@@ -79,11 +75,9 @@ relational operator>(const ex & lh, const ex & rh);
 relational operator>=(const ex & lh, const ex & rh);
 
 // input/output stream operators
-ostream & operator<<(ostream & os, const ex & e);
-istream & operator>>(istream & is, ex & e);
+std::ostream & operator<<(std::ostream & os, const ex & e);
+std::istream & operator>>(std::istream & is, ex & e);
 
-#ifndef NO_GINAC_NAMESPACE
 } // namespace GiNaC
-#endif // ndef NO_GINAC_NAMESPACE
 
 #endif // ndef __GINAC_OPERATORS_H__