X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHUtils%2FSMESH_Octree.hxx;h=d21fa9d9e81be8333f70cce83e6799b83a28fd87;hb=7084b4f9799cf4a0145ba86ab8b653de8f2d2bdb;hp=adb74b560f5d5119c853ede6777a810a59998eab;hpb=ef59152514df17c64ad01c8abab01331618a1fc4;p=modules%2Fsmesh.git diff --git a/src/SMESHUtils/SMESH_Octree.hxx b/src/SMESHUtils/SMESH_Octree.hxx index adb74b560..d21fa9d9e 100644 --- a/src/SMESHUtils/SMESH_Octree.hxx +++ b/src/SMESHUtils/SMESH_Octree.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -6,7 +6,7 @@ // 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. +// version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -55,7 +55,7 @@ public: double maxSize() const; // Return index of a child the given point is in - inline int getChildIndex(double x, double y, double z, const gp_XYZ& boxMiddle)const; + inline static int getChildIndex(double x, double y, double z, const gp_XYZ& boxMiddle); protected: @@ -67,7 +67,7 @@ public: /*! * \brief Return index of a child the given point is in */ -inline int SMESH_Octree::getChildIndex(double x, double y, double z, const gp_XYZ& mid) const +inline int SMESH_Octree::getChildIndex(double x, double y, double z, const gp_XYZ& mid) { return (x > mid.X()) + ( y > mid.Y())*2 + (z > mid.Z())*4; }