X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDCoupling%2FMCType.hxx;h=2393f9f5a7ebf459083db62c866a86b4b6ba12a0;hb=fe438311fdcdfa797c8e6a95357164a89cc7abc0;hp=01e2dd1f963d2f6aefca18eea7eae8abda05eb1f;hpb=90b804f439579ee0791a35032522678ca9f3fb17;p=tools%2Fmedcoupling.git

diff --git a/src/MEDCoupling/MCType.hxx b/src/MEDCoupling/MCType.hxx
index 01e2dd1f9..2393f9f5a 100644
--- a/src/MEDCoupling/MCType.hxx
+++ b/src/MEDCoupling/MCType.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2017  CEA/DEN, EDF R&D
+// Copyright (C) 2017-2020  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
@@ -21,16 +21,38 @@
 #ifndef __MEDCOUPLING_MCTYPE_HXX__
 #define __MEDCOUPLING_MCTYPE_HXX__
 
+#include "MCIdType.hxx"
+
+#include <cstdint>
+#include <stddef.h>
+#include <cstddef>
+
 namespace MEDCoupling
 {
-  typedef long Int64;
-  typedef int Int32;
-  typedef int mcIdType;
-}
+  using mcIdType = ::mcIdType;
+  using Int64 = std::int64_t;
+  using Int32 = std::int32_t;
+
+  class DataArrayInt32;
+  class DataArrayInt32Iterator;
+  class DataArrayInt32Tuple;
+  class DataArrayInt64;
+  class DataArrayInt64Tuple;
+
+#ifndef MEDCOUPLING_USE_64BIT_IDS
 
-#define DataArrayInt DataArrayInt32
 #define DataArrayIdType DataArrayInt32
+#define DataArrayIdTypeTuple DataArrayInt32Tuple
 
+#else
+
+#define DataArrayIdType DataArrayInt64
+#define DataArrayIdTypeTuple DataArrayInt64Tuple
+
+#endif
+
+#define DataArrayInt DataArrayInt32
 #define DataArrayIntIterator DataArrayInt32Iterator
+}
 
 #endif