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
SWIG exception: removing C++11 warnings, minimal work.
[tools/medcoupling.git]
/
src
/
MEDLoader
/
MEDLoaderTraits.hxx
diff --git
a/src/MEDLoader/MEDLoaderTraits.hxx
b/src/MEDLoader/MEDLoaderTraits.hxx
index 73f6a4e3f32cdbb34a7cbab0a628b35ff9be7d9e..631bf325c65d139f3b26d42d29280427d5ecfd7f 100644
(file)
--- a/
src/MEDLoader/MEDLoaderTraits.hxx
+++ b/
src/MEDLoader/MEDLoaderTraits.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2016 CEA/DEN, EDF R&D
+// Copyright (C) 2016
-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
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@
-35,13
+35,19
@@
namespace MEDCoupling
class MEDFileField1TS;
class MEDFileIntFieldMultiTS;
class MEDFileIntField1TS;
class MEDFileField1TS;
class MEDFileIntFieldMultiTS;
class MEDFileIntField1TS;
+ class MEDFileFloatFieldMultiTS;
+ class MEDFileFloatField1TS;
class MEDFileField1TSWithoutSDA;
class MEDFileIntField1TSWithoutSDA;
class MEDFileFloatField1TSWithoutSDA;
class MEDFileField1TSWithoutSDA;
class MEDFileIntField1TSWithoutSDA;
class MEDFileFloatField1TSWithoutSDA;
+ class MEDFileFieldMultiTSWithoutSDA;
+ class MEDFileIntFieldMultiTSWithoutSDA;
+ class MEDFileFloatFieldMultiTSWithoutSDA;
template<>
struct MEDLOADER_EXPORT MLFieldTraits<double>
{
template<>
struct MEDLOADER_EXPORT MLFieldTraits<double>
{
+ typedef MEDFileFieldMultiTSWithoutSDA FMTSWSDAType;
typedef MEDFileFieldMultiTS FMTSType;
typedef MEDFileField1TS F1TSType;
typedef MEDFileField1TSWithoutSDA F1TSWSDAType;
typedef MEDFileFieldMultiTS FMTSType;
typedef MEDFileField1TS F1TSType;
typedef MEDFileField1TSWithoutSDA F1TSWSDAType;
@@
-50,14
+56,16
@@
namespace MEDCoupling
template<>
struct MEDLOADER_EXPORT MLFieldTraits<float>
{
template<>
struct MEDLOADER_EXPORT MLFieldTraits<float>
{
- //typedef MEDFileFloatFieldMultiTS FMTSType;
- //typedef MEDFileFloatField1TS F1TSType;
+ typedef MEDFileFloatFieldMultiTSWithoutSDA FMTSWSDAType;
+ typedef MEDFileFloatFieldMultiTS FMTSType;
+ typedef MEDFileFloatField1TS F1TSType;
typedef MEDFileFloatField1TSWithoutSDA F1TSWSDAType;
};
template<>
struct MEDLOADER_EXPORT MLFieldTraits<int>
{
typedef MEDFileFloatField1TSWithoutSDA F1TSWSDAType;
};
template<>
struct MEDLOADER_EXPORT MLFieldTraits<int>
{
+ typedef MEDFileIntFieldMultiTSWithoutSDA FMTSWSDAType;
typedef MEDFileIntFieldMultiTS FMTSType;
typedef MEDFileIntField1TS F1TSType;
typedef MEDFileIntField1TSWithoutSDA F1TSWSDAType;
typedef MEDFileIntFieldMultiTS FMTSType;
typedef MEDFileIntField1TS F1TSType;
typedef MEDFileIntField1TSWithoutSDA F1TSWSDAType;