MEDFileCurveLinearMesh -> getSpaceDimension() was missing

[tools/medcoupling.git] / src / INTERP_KERNEL / Bases / InterpKernelHashTable.hxx

diff --git a/src/INTERP_KERNEL/Bases/InterpKernelHashTable.hxx b/src/INTERP_KERNEL/Bases/InterpKernelHashTable.hxx
index 63544b3e8afcf474360ea9ca986d4fc7e71debfc..5659e8e7c167c250ad2bd7101ae02877f283d5c0 100644 (file)
--- a/src/INTERP_KERNEL/Bases/InterpKernelHashTable.hxx
+++ b/src/INTERP_KERNEL/Bases/InterpKernelHashTable.hxx
@@ -1,21 +1,11 @@
-// Copyright (C) 2001-2014  CEA/DEN, EDF R&D
-//
-// 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, 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
-// 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
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+// Free Software Foundation, Inc.
 //
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, 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
@@ -187,22 +177,22 @@ namespace INTERP_KERNEL
   // Note: assumes long is at least 32 bits.
   enum { _S_num_primes = 28 };
 
-  static const unsigned long __stl_prime_list[_S_num_primes] =
+  static const unsigned long long __stl_prime_list[_S_num_primes] =
     {
-      53ul,         97ul,         193ul,       389ul,       769ul,
-      1543ul,       3079ul,       6151ul,      12289ul,     24593ul,
-      49157ul,      98317ul,      196613ul,    393241ul,    786433ul,
-      1572869ul,    3145739ul,    6291469ul,   12582917ul,  25165843ul,
-      50331653ul,   100663319ul,  201326611ul, 402653189ul, 805306457ul,
-      1610612741ul, 3221225473ul, 4294967291ul
+      53ull,         97ull,         193ull,       389ull,       769ull,
+      1543ull,       3079ull,       6151ull,      12289ull,     24593ull,
+      49157ull,      98317ull,      196613ull,    393241ull,    786433ull,
+      1572869ull,    3145739ull,    6291469ull,   12582917ull,  25165843ull,
+      50331653ull,   100663319ull,  201326611ull, 402653189ull, 805306457ull,
+      1610612741ull, 3221225473ull, 4294967291ull
     };
 
-  inline unsigned long
-  __stl_next_prime(unsigned long __n)
+  inline unsigned long long
+  __stl_next_prime(unsigned long long __n)
   {
-    const unsigned long* __first = __stl_prime_list;
-    const unsigned long* __last = __stl_prime_list + (int)_S_num_primes;
-    const unsigned long* pos = std::lower_bound(__first, __last, __n);
+    const unsigned long long* __first = __stl_prime_list;
+    const unsigned long long* __last = __stl_prime_list + (int)_S_num_primes;
+    const unsigned long long* pos = std::lower_bound(__first, __last, __n);
     return pos == __last ? *(__last - 1) : *pos;
   }
 
@@ -489,7 +479,7 @@ namespace INTERP_KERNEL
     void clear();
 
   private:
-    size_type _M_next_size(size_type __n) const { return __stl_next_prime(__n); }
+    size_type _M_next_size(size_type __n) const { return static_cast<size_type>(__stl_next_prime(__n)); }
 
     void _M_initialize_buckets(size_type __n)
     {