Fix clang compilation (template instanciations) + clang warnings

[tools/medcoupling.git] / src / MEDCoupling / Test / MEDCouplingBasicsTest.hxx

diff --git a/src/MEDCoupling/Test/MEDCouplingBasicsTest.hxx b/src/MEDCoupling/Test/MEDCouplingBasicsTest.hxx
index df10855c3c725b9ea11764f4f12d9cea1def774f..561f7b2587b793cbc740535566b094947b63d485 100644 (file)
--- a/src/MEDCoupling/Test/MEDCouplingBasicsTest.hxx
+++ b/src/MEDCoupling/Test/MEDCouplingBasicsTest.hxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D
+// Copyright (C) 2007-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
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// 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
@@ -22,11 +22,12 @@
 #define __MEDCOUPLINGBASICSTEST_HXX__
 
 #include <cppunit/extensions/HelperMacros.h>
+#include "MCType.hxx"
 
 #include <map>
 #include <vector>
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class DataArrayDouble;
   class MEDCouplingUMesh;
@@ -93,9 +94,9 @@ namespace ParaMEDMEM
     static DataArrayDouble *buildCoordsForMultiTypes_1();
     static MEDCouplingMultiFields *buildMultiFields_1();
     static std::vector<MEDCouplingFieldDouble *> buildMultiFields_2();
-    static double sumAll(const std::vector< std::map<int,double> >& matrix);
+    static double sumAll(const std::vector< std::map<mcIdType,double> >& matrix);
   protected:
-    static int countNonZero(const std::vector< std::map<int,double> >& matrix);
+    static int countNonZero(const std::vector< std::map<mcIdType,double> >& matrix);
 
     static void test2D1DMeshesIntersection(MEDCouplingUMesh *sourceMesh,
                                            MEDCouplingUMesh *targetMesh,