From: emv <emv@opencascade.com>
Date: Mon, 21 Oct 2019 13:01:01 +0000 (+0300)
Subject: Moving definition of mcIdType to INTERP_KERNEL
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c2197261a3a861f04b7261eddaf73c79d8d2f917;p=tools%2Fmedcoupling.git

Moving definition of mcIdType to INTERP_KERNEL
---

diff --git a/src/INTERP_KERNEL/Bases/InterpKernelTypedef.hxx b/src/INTERP_KERNEL/Bases/InterpKernelTypedef.hxx
new file mode 100644
index 000000000..1cfd50b20
--- /dev/null
+++ b/src/INTERP_KERNEL/Bases/InterpKernelTypedef.hxx
@@ -0,0 +1,46 @@
+// Copyright (C) 2017-2019  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
+//
+// Author : Anthony Geay (EDF R&D)
+
+#ifndef __INTERP_KERNEL_TYPEDEF_HXX__
+#define __INTERP_KERNEL_TYPEDEF_HXX__
+
+#include <cstdint>
+#include <stddef.h>
+#include <cstddef>
+
+namespace INTERP_KERNEL
+{
+  using Int64 = std::int64_t;
+  using Int32 = std::int32_t;
+#ifndef MEDCOUPLING_USE_64BIT_IDS
+  using mcIdType = std::int32_t;
+#else
+  //using mcIdType = std::int64_t;
+#endif
+  using mcIdType = std::int32_t;
+
+  template <class T>
+  inline mcIdType ToIdType(T val)
+  {
+    return static_cast<mcIdType>(val);
+  }
+}
+
+#endif
diff --git a/src/MEDCoupling/MCType.hxx b/src/MEDCoupling/MCType.hxx
index bf2a047f1..61d2f12c8 100644
--- a/src/MEDCoupling/MCType.hxx
+++ b/src/MEDCoupling/MCType.hxx
@@ -25,21 +25,18 @@
 #include <stddef.h>
 #include <cstddef>
 
+#include "InterpKernelTypedef.hxx"
+
 namespace MEDCoupling
 {
-  using Int64 = std::int64_t;
-  using Int32 = std::int32_t;
-#ifndef MEDCOUPLING_USE_64BIT_IDS
-  using mcIdType = std::int32_t;
-#else
-  //using mcIdType = std::int64_t;
-#endif
-  using mcIdType = std::int32_t;
+  typedef INTERP_KERNEL::Int64 Int64;
+  typedef INTERP_KERNEL::Int32 Int32;
+  typedef INTERP_KERNEL::mcIdType mcIdType;
 
   template <class T>
   inline mcIdType ToIdType(T val)
   {
-    return static_cast<mcIdType>(val);
+    return INTERP_KERNEL::ToIdType(val);
   }
 }