X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEFISTO2%2FRn.h;h=9aafe707b9ac5cf3f456fbfed81dc05b9fc25861;hb=ea3e3193e3d50a44a4b3a069fc4fc1239c22f27b;hp=2bf72bc7b312171b31247f6c31de6adab21dca04;hpb=2a01836df7e8236c96093b7e2f85b567966078dc;p=modules%2Fsmesh.git diff --git a/src/MEFISTO2/Rn.h b/src/MEFISTO2/Rn.h index 2bf72bc7b..9aafe707b 100755 --- a/src/MEFISTO2/Rn.h +++ b/src/MEFISTO2/Rn.h @@ -41,7 +41,6 @@ #include #include -using namespace std; template inline T Abs (const T &a){return a <0 ? -a : a;} template inline void Echange (T& a,T& b) {T c=a;a=b;b=c;} @@ -81,14 +80,14 @@ typedef double R; //============ class R2 { - friend ostream& operator << (ostream& f, const R2 & P) + friend std::ostream& operator << (std::ostream& f, const R2 & P) { f << P.x << ' ' << P.y ; return f; } - friend istream& operator >> (istream& f, R2 & P) + friend std::istream& operator >> (std::istream& f, R2 & P) { f >> P.x >> P.y ; return f; } - friend ostream& operator << (ostream& f, const R2 * P) + friend std::ostream& operator << (std::ostream& f, const R2 * P) { f << P->x << ' ' << P->y ; return f; } - friend istream& operator >> (istream& f, R2 * P) + friend std::istream& operator >> (std::istream& f, R2 * P) { f >> P->x >> P->y ; return f; } public: @@ -120,14 +119,14 @@ public: //============ class R3 { - friend ostream& operator << (ostream& f, const R3 & P) + friend std::ostream& operator << (std::ostream& f, const R3 & P) { f << P.x << ' ' << P.y << ' ' << P.z ; return f; } - friend istream& operator >> (istream& f, R3 & P) + friend std::istream& operator >> (std::istream& f, R3 & P) { f >> P.x >> P.y >> P.z ; return f; } - friend ostream& operator << (ostream& f, const R3 * P) + friend std::ostream& operator << (std::ostream& f, const R3 * P) { f << P->x << ' ' << P->y << ' ' << P->z ; return f; } - friend istream& operator >> (istream& f, R3 * P) + friend std::istream& operator >> (std::istream& f, R3 * P) { f >> P->x >> P->y >> P->z ; return f; } public: @@ -173,12 +172,12 @@ public: //============ class R4: public R3 { - friend ostream& operator <<(ostream& f, const R4 & P ) + friend std::ostream& operator <<(std::ostream& f, const R4 & P ) { f << P.x << ' ' << P.y << ' ' << P.z << ' ' << P.omega; return f; } friend istream& operator >>(istream& f, R4 & P) { f >> P.x >> P.y >> P.z >> P.omega ; return f; } - friend ostream& operator <<(ostream& f, const R4 * P ) + friend std::ostream& operator <<(std::ostream& f, const R4 * P ) { f << P->x << ' ' << P->y << ' ' << P->z << ' ' << P->omega; return f; } friend istream& operator >>(istream& f, R4 * P) { f >> P->x >> P->y >> P->z >> P->omega ; return f; }