X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDCoupling%2FMCType.hxx;h=cd5e65c5d8ea2e92d558cfc3f564f112ca723b4d;hb=04f1c450d57b28c7c473bdc59dc87eeef7393ca5;hp=01e2dd1f963d2f6aefca18eea7eae8abda05eb1f;hpb=f2690dd9bd062d8727817a86abc53237357187ed;p=tools%2Fmedcoupling.git

diff --git a/src/MEDCoupling/MCType.hxx b/src/MEDCoupling/MCType.hxx
index 01e2dd1f9..cd5e65c5d 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
@@ -18,19 +18,38 @@
 //
 // Author : Anthony Geay (EDF R&D)
 
-#ifndef __MEDCOUPLING_MCTYPE_HXX__
-#define __MEDCOUPLING_MCTYPE_HXX__
+#pragma once
+
+#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
 
-#define DataArrayIntIterator DataArrayInt32Iterator
+#else
+
+#define DataArrayIdType DataArrayInt64
+#define DataArrayIdTypeTuple DataArrayInt64Tuple
 
 #endif
+
+#define DataArrayInt DataArrayInt32
+#define DataArrayIntIterator DataArrayInt32Iterator
+}