X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEFISTO2%2FRn.h;h=22582f71310a34d74f41f1fba99a0531c25c4263;hb=de3c6b4c6100515a37e8f83bb493b473452a373f;hp=9aafe707b9ac5cf3f456fbfed81dc05b9fc25861;hpb=e4737e85f0da6d3f90fd08f6be1c2825195fe16f;p=modules%2Fsmesh.git diff --git a/src/MEFISTO2/Rn.h b/src/MEFISTO2/Rn.h index 9aafe707b..22582f713 100755 --- a/src/MEFISTO2/Rn.h +++ b/src/MEFISTO2/Rn.h @@ -1,29 +1,27 @@ // MEFISTO : library to compute 2D triangulation from segmented boundaries // -// Copyright (C) 2003 Laboratoire J.-L. Lions UPMC Paris -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.ann.jussieu.fr/~perronne or email Perronnet@ann.jussieu.fr -// or email Hecht@ann.jussieu.fr +// Copyright (C) 2006-2013 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 +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : Rn.h // Module : SMESH // Authors: Frederic HECHT & Alain PERRONNET -// +// Date : 13 novembre 2006 #ifndef Rn__h #define Rn__h @@ -62,11 +60,19 @@ typedef char Nom[1+24]; //le type N des nombres entiers positifs //========= +#ifndef PCLINUX64 typedef unsigned long int N; +#else +typedef unsigned int N; +#endif //le type Z des nombres entiers relatifs //========= +#ifndef PCLINUX64 typedef long int Z; +#else +typedef int Z; +#endif //le type R des nombres "reels" //========= @@ -164,8 +170,8 @@ public: bool DansPave( R3 & xyzMin, R3 & xyzMax ) { return xyzMin.x<=x && x<=xyzMax.x && - xyzMin.y<=y && y<=xyzMax.y && - xyzMin.z<=z && z<=xyzMax.z; } + xyzMin.y<=y && y<=xyzMax.y && + xyzMin.z<=z && z<=xyzMax.z; } }; //la classe R4