X-Git-Url: https://ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Foperators.h;h=8636e212d5922cf3ffbdfbd5af05e4caf044409a;hb=9d8d0f4924171b0acb7ec6a333897fe1ec545707;hp=f163ec55ae4f56faa42998cc46507982bec75e4f;hpb=15d4b353c85f8815a95d97ab977c9ca48e155574;p=ginac.git

diff --git a/ginac/operators.h b/ginac/operators.h
index f163ec55..8636e212 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,20 +25,18 @@
 
 #include <iostream>
 
-#ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {
-#endif // ndef NO_GINAC_NAMESPACE
 
 class ex;
 class numeric;
 class relational;
 
 // binary arithmetic operators ex with ex
-ex operator+(ex const & lh, ex const & rh);
-ex operator-(ex const & lh, ex const & rh);
-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
+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);
@@ -47,11 +45,11 @@ numeric operator*(const numeric & lh, const numeric & rh);
 numeric operator/(const numeric & lh, const numeric & rh);
 
 // binary arithmetic assignment operators with ex
-ex const & operator+=(ex & lh, ex const & rh);
-ex const & operator-=(ex & lh, ex const & rh);
-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
+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);
@@ -60,8 +58,8 @@ const numeric & operator*=(numeric & lh, const numeric & rh);
 const numeric & operator/=(numeric & lh, const numeric & rh);
 
 // unary operators
-ex operator+(ex const & lh);
-ex operator-(ex const & lh);
+ex operator+(const ex & lh);
+ex operator-(const ex & lh);
 
 numeric operator+(const numeric & lh);
 numeric operator-(const numeric & lh);
@@ -71,19 +69,17 @@ numeric operator++(numeric & lh, int);
 numeric operator--(numeric & lh, int);
 
 // binary relational operators ex with ex
-relational operator==(ex const & lh, ex const & rh);
-relational operator!=(ex const & lh, ex const & rh);
-relational operator<(ex const & lh, ex const & rh);
-relational operator<=(ex const & lh, ex const & rh);
-relational operator>(ex const & lh, ex const & rh);
-relational operator>=(ex const & lh, ex const & rh);
+relational operator==(const ex & lh, const ex & rh);
+relational operator!=(const ex & lh, const ex & rh);
+relational operator<(const ex & lh, const ex & rh);
+relational operator<=(const ex & lh, const ex & rh);
+relational operator>(const ex & lh, const ex & rh);
+relational operator>=(const ex & lh, const ex & rh);
 
 // input/output stream operators
-ostream & operator<<(ostream & os, ex const & 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__