X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FMEFISTO2%2FRn.h;h=f832ad9183e51a4b5845cf73cc8bec2d755f53fa;hp=6ec871d932ebe6884230eff2afa768298ee28bc4;hb=6472eab132825fec572beda8276947593f85ffa1;hpb=7a65c9fad427b1ccba6b9ccae612296e5092a324 diff --git a/src/MEFISTO2/Rn.h b/src/MEFISTO2/Rn.h old mode 100755 new mode 100644 index 6ec871d93..f832ad918 --- a/src/MEFISTO2/Rn.h +++ b/src/MEFISTO2/Rn.h @@ -1,6 +1,6 @@ -// MEFISTO : library to compute 2D triangulation from segmented boundaries +// MEFISTO : library to compute 2D triangulation from segmented boundaries // -// Copyright (C) 2006-2015 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2006-2019 CEA/DEN, EDF R&D, OPEN CASCADE // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -180,12 +180,12 @@ class R4: public R3 { 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) + friend std::istream& operator >>(std::istream& f, R4 & P) { f >> P.x >> P.y >> P.z >> P.omega ; return f; } 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) + friend std::istream& operator >>(std::istream& f, R4 * P) { f >> P->x >> P->y >> P->z >> P->omega ; return f; } public: