Salome HOME
projects
/
tools
/
medcoupling.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug with FindClosestTupleIdAlg fixed (preventing the threshold to be null)
[tools/medcoupling.git]
/
src
/
MEDCoupling
/
MCType.hxx
diff --git
a/src/MEDCoupling/MCType.hxx
b/src/MEDCoupling/MCType.hxx
index 2bb14a2f538596c689647d2642da3e7f21afb5e3..cd5e65c5d8ea2e92d558cfc3f564f112ca723b4d 100644
(file)
--- 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
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@
-18,23
+18,38
@@
//
// Author : Anthony Geay (EDF R&D)
//
// Author : Anthony Geay (EDF R&D)
-#ifndef __MEDCOUPLING_MCTYPE_HXX__
-#define __MEDCOUPLING_MCTYPE_HXX__
+#pragma once
+
+#include "MCIdType.hxx"
#include <cstdint>
#include <cstdint>
+#include <stddef.h>
+#include <cstddef>
namespace MEDCoupling
{
namespace MEDCoupling
{
+ using mcIdType = ::mcIdType;
using Int64 = std::int64_t;
using Int32 = std::int32_t;
using Int64 = std::int64_t;
using Int32 = std::int32_t;
- using mcIdType = std::int32_t;
- inline mcIdType ToIdType(std::size_t val) { return mcIdType(val); }
-}
+ class DataArrayInt32;
+ class DataArrayInt32Iterator;
+ class DataArrayInt32Tuple;
+ class DataArrayInt64;
+ class DataArrayInt64Tuple;
+
+#ifndef MEDCOUPLING_USE_64BIT_IDS
-#define DataArrayInt DataArrayInt32
#define DataArrayIdType DataArrayInt32
#define DataArrayIdType DataArrayInt32
+#define DataArrayIdTypeTuple DataArrayInt32Tuple
-#define DataArrayIntIterator DataArrayInt32Iterator
+#else
+
+#define DataArrayIdType DataArrayInt64
+#define DataArrayIdTypeTuple DataArrayInt64Tuple
#endif
#endif
+
+#define DataArrayInt DataArrayInt32
+#define DataArrayIntIterator DataArrayInt32Iterator
+}