Merge branch 'occ/shaper2smesh'

[modules/smesh.git] / src / MEFISTO2 / Rn.h

diff --git a/src/MEFISTO2/Rn.h b/src/MEFISTO2/Rn.h
old mode 100755 (executable)
new mode 100644 (file)
index d068199..f832ad9
--- 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-2016  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: