CLang compatibility

diff --git a/src/INTERP_KERNEL/InterpKernelMeshQuality.hxx b/src/INTERP_KERNEL/InterpKernelMeshQuality.hxx
index 6ac61c3d0c4cd621c89a6518882fec4904fa1a50..b61a384bebcd4844f1f365498448ca7d0d2fec3f 100644 (file)
--- a/src/INTERP_KERNEL/InterpKernelMeshQuality.hxx
+++ b/src/INTERP_KERNEL/InterpKernelMeshQuality.hxx
@@ -18,7 +18,7 @@
 //
 // Author : Anthony Geay (CEA/DEN)
 
-#ifndef __INTERPKERNELMESHQUALITY_HXX_
+#ifndef __INTERPKERNELMESHQUALITY_HXX__
 #define __INTERPKERNELMESHQUALITY_HXX__
 
 #include "INTERPKERNELDefines.hxx"

diff --git a/src/INTERP_KERNELTest/SingleElementPlanarTests.cxx b/src/INTERP_KERNELTest/SingleElementPlanarTests.cxx
index 2abd41fddb1e993e6f5da12475b72b1773edb5bb..b0c8d29fcdcdbe7755fe5d5c99573ff7b74c80ee 100644 (file)
--- a/src/INTERP_KERNELTest/SingleElementPlanarTests.cxx
+++ b/src/INTERP_KERNELTest/SingleElementPlanarTests.cxx
@@ -262,17 +262,17 @@ namespace INTERP_TEST
   }
   //  Square and diamond intersecting with no degeneracy
   //               /\
-  //              /  \  
-  //             /    \      
-  //          __/______\__    
-  //         | /        \ |  
-  //         |/          \|      
+  //              /  \
+  //             /    \
+  //          __/______\__
+  //         | /        \ |
+  //         |/          \|
   //         /            \
-  //        /|            |\   
-  //        \|            |/      
-  //         \            /      
-  //         |\          /|     
-  //         |_\________/_|      
+  //        /|            |\
+  //        \|            |/
+  //         \            /
+  //         |\          /|
+  //         |_\________/_|
   //            \      /
   //             \    /
   //              \  /
@@ -369,7 +369,7 @@ namespace INTERP_TEST
   //  Two diamonds intersecting at one vertex on edge and one double vertex
   //             /\   /\
   //            /  \ /  \
-  //           /    ¤    \
+  //           /    �    \
   //          /    / \    \
   //          \    \ /    /
   //           \    *    /
@@ -500,12 +500,12 @@ namespace INTERP_TEST
                            (INTERP_KERNEL::checkEqualPolygons<std::vector<double>,2>(&actual_result, &expected_result, _Epsilon)));
   }  //  square and diamond intersecting at four degenerated pointss 
   //    
-  //      ²/²\  
-  //          ² / ² \ 
-  //           ²  /  ²  \
-  //           ²  \  ²  /
-  //          ² \ ² /
-  //      ²\²/
+  //      �/�\  
+  //          � / � \ 
+  //           �  /  �  \
+  //           �  \  �  /
+  //          � \ � /
+  //      �\�/
   // \brief Status : pass
 
   void SingleElementPlanarTests::diamondsCritical2()
@@ -542,14 +542,14 @@ namespace INTERP_TEST
 
   //  Two tangent hexagons with double vertices and a critical starting vertex on edge
   //      _________ 
-  //             /         \²²²
-  //            ²           \² 
+  //             /         \���
+  //            �           \� 
   //           /             \ 
-  //          / ²           ² \
+  //          / �           � \
   //          \               /
-  //           \ ²         ² /
+  //           \ �         � /
   //            \           /
-  //             \²_______²/
+  //             \�_______�/
 
 
   // \brief Status : pass
@@ -599,11 +599,11 @@ namespace INTERP_TEST
   //  Two tangent hexagons with double vertices and a critical starting vertex on edge
   //              _______
   //             /       \
-  //            /         \ 
+  //            /         \
   //            \         /
   //             \_______/
   //             /       \
-  //            /         \ 
+  //            /         \
   //            \         /
   //             \_______/
 
@@ -666,22 +666,22 @@ namespace INTERP_TEST
                            (INTERP_KERNEL::checkEqualPolygons<std::vector<double>,2>(&actual_result, &expected_result, _Epsilon)));
   }
   //  Two diamonds sharing a vertex in an exclusion configuration
-  //             /\   
-  //            /  \    
-  //           /    \  
-  //          /      \      
-  //          \      /      
-  //           \    /      
-  //            \  /      
-  //             \/      
-  //             /\   
-  //            /  \    
-  //           /    \  
-  //          /      \      
-  //          \      /      
-  //           \    /      
-  //            \  /      
-  //             \/      
+  //             /\
+  //            /  \
+  //           /    \
+  //          /      \
+  //          \      /
+  //           \    /
+  //            \  /
+  //             \/
+  //             /\
+  //            /  \
+  //           /    \
+  //          /      \
+  //          \      /
+  //           \    /
+  //            \  /
+  //             \/
 
 
   // \brief Status : pass
@@ -710,12 +710,12 @@ namespace INTERP_TEST
   //               ____  
   //             /|\  / 
   //            / | \/    
-  //           /  | /\  
-  //          /   |/  \      
-  //          \       /      
-  //           \     /      
-  //            \   /      
-  //             \ /      
+  //           /  | /\
+  //          /   |/  \
+  //          \       /
+  //           \     /
+  //            \   /
+  //             \ /
 
   // \brief Status : pass
   void SingleElementPlanarTests:: triangleAndDiamondCritical()
@@ -751,7 +751,7 @@ namespace INTERP_TEST
   //     |          |
   //     |       |\ |
   //     |       | \|
-  //     |       |  \ 
+  //     |       |  \
   //     |       |  |\
   //     |       |  |/
   //     |       |  / 
@@ -794,10 +794,10 @@ namespace INTERP_TEST
   }
   //  Two triangles with a starting vertex on edge
 
-  //             /\ ²²²²  
-  //            /  ²  ²  
-  //           /  ² ²  
-  //          /__²___\   
+  //             /\ ����  
+  //            /  �  �  
+  //           /  � �  
+  //          /__�___\
 
   // \brief Status : pass
   void SingleElementPlanarTests::trianglesCritical()
@@ -839,7 +839,7 @@ namespace INTERP_TEST
   //             /\      /\
   //            /  \    /  \
   //           /    \  /    \
-  //          /______\/______\      
+  //          /______\/______\
 
 
   // \brief Status : pass
@@ -952,10 +952,10 @@ namespace INTERP_TEST
   }
 
   //  Two triangles with double starting point in an outer tangency configuration
-  //             /\   
-  //            /  \    
-  //           /    \  
-  //          /______\        
+  //             /\
+  //            /  \
+  //           /    \
+  //          /______\
   //          \      /      
   //           \    /      
   //            \  /      

diff --git a/src/INTERP_KERNELTest/TransformedTriangleTest.cxx b/src/INTERP_KERNELTest/TransformedTriangleTest.cxx
index da36fb861fec0685bd0c3a189b5c0f93de9fd000..4cc591f27b05c7efe0c82c7d584a2027d7eb16fa 100644 (file)
--- a/src/INTERP_KERNELTest/TransformedTriangleTest.cxx
+++ b/src/INTERP_KERNELTest/TransformedTriangleTest.cxx
@@ -263,7 +263,7 @@ namespace INTERP_TEST
         const int num_zero = (c_yz*c_xh == 0.0 ? 1 : 0) + (c_zx*c_yh == 0.0 ? 1 : 0) + (c_xy*c_zh == 0.0 ? 1 : 0);
         const int num_neg = (c_yz*c_xh < 0.0 ? 1 : 0) + (c_zx*c_yh < 0.0 ? 1 : 0) + (c_xy*c_zh < 0.0 ? 1 : 0);
       
-        if((num_zero == 1 && num_neg != 1) || num_zero == 2 || num_neg == 0 && num_zero !=3 || num_neg == 3 )
+        if((num_zero == 1 && num_neg != 1) || num_zero == 2 || (num_neg == 0 && num_zero !=3) || num_neg == 3 )
           {
             ++num_cases;
   

diff --git a/src/MEDCoupling/MEDCouplingFieldDouble.cxx b/src/MEDCoupling/MEDCouplingFieldDouble.cxx
index c4841f062cffb3f236ee4eb43163435e9d0b786a..3fef0349a7904199a877d96b4e33c9b96ec2c7c1 100644 (file)
--- a/src/MEDCoupling/MEDCouplingFieldDouble.cxx
+++ b/src/MEDCoupling/MEDCouplingFieldDouble.cxx
@@ -39,7 +39,7 @@
 
 using namespace MEDCoupling;
 
-template class MEDCouplingFieldT<double>;
+template class MEDCoupling::MEDCouplingFieldT<double>;
 
 /*!
  * Creates a new MEDCouplingFieldDouble, of given spatial type and time discretization.

diff --git a/src/MEDCoupling/MEDCouplingFieldInt.cxx b/src/MEDCoupling/MEDCouplingFieldInt.cxx
index f6b6fa2978130f15f38b684ea2e585b498b8c944..51811f687a9f11f8f6dd99d2a59ab513e94ad754 100644 (file)
--- a/src/MEDCoupling/MEDCouplingFieldInt.cxx
+++ b/src/MEDCoupling/MEDCouplingFieldInt.cxx
@@ -26,7 +26,7 @@
 
 using namespace MEDCoupling;
 
-template class MEDCouplingFieldT<int>;
+template class MEDCoupling::MEDCouplingFieldT<int>;
 
 MEDCouplingFieldInt *MEDCouplingFieldInt::New(TypeOfField type, TypeOfTimeDiscretization td)
 {

diff --git a/src/MEDCoupling/MEDCouplingMemArray.cxx b/src/MEDCoupling/MEDCouplingMemArray.cxx
index 53213b741d529f377d1525d69a924f4e14631e14..6609e9142c3ba262c40bf0ace31198103d9fea61 100644 (file)
--- a/src/MEDCoupling/MEDCouplingMemArray.cxx
+++ b/src/MEDCoupling/MEDCouplingMemArray.cxx
@@ -36,10 +36,10 @@ typedef double (*MYFUNCPTR)(double);
 
 using namespace MEDCoupling;
 
-template class MemArray<int>;
-template class MemArray<double>;
-template class DataArrayTemplate<int>;
-template class DataArrayTemplate<double>;
+template class MEDCoupling::MemArray<int>;
+template class MEDCoupling::MemArray<double>;
+template class MEDCoupling::DataArrayTemplate<int>;
+template class MEDCoupling::DataArrayTemplate<double>;
 
 template<int SPACEDIM>
 void DataArrayDouble::findCommonTuplesAlg(const double *bbox, int nbNodes, int limitNodeId, double prec, DataArrayInt *c, DataArrayInt *cI) const

diff --git a/src/MEDCoupling/MEDCouplingMemArrayChar.cxx b/src/MEDCoupling/MEDCouplingMemArrayChar.cxx
index 854dcf8802abcb4cc7e9c649c971d182f7cc13b0..590423fdb2bd6b22bac590cdc9ce7bf5df8a447e 100644 (file)
--- a/src/MEDCoupling/MEDCouplingMemArrayChar.cxx
+++ b/src/MEDCoupling/MEDCouplingMemArrayChar.cxx
@@ -30,8 +30,8 @@
 
 using namespace MEDCoupling;
 
-template class MemArray<char>;
-template class DataArrayTemplate<char>;
+template class MEDCoupling::MemArray<char>;
+template class MEDCoupling::DataArrayTemplate<char>;
 
 /*!
  * Returns an integer value characterizing \a this array, which is useful for a quick

diff --git a/src/MEDCoupling/MEDCouplingTimeDiscretization.cxx b/src/MEDCoupling/MEDCouplingTimeDiscretization.cxx
index b29ee50fd3db932f5ec93859ec37d3d0d4febac3..988048d99dd413564dea1eabb6c9551f4d11836e 100644 (file)
--- a/src/MEDCoupling/MEDCouplingTimeDiscretization.cxx
+++ b/src/MEDCoupling/MEDCouplingTimeDiscretization.cxx
@@ -29,8 +29,8 @@
 
 using namespace MEDCoupling;
 
-template class MEDCouplingTimeDiscretizationTemplate<double>;
-template class MEDCouplingTimeDiscretizationTemplate<int>;
+template class MEDCoupling::MEDCouplingTimeDiscretizationTemplate<double>;
+template class MEDCoupling::MEDCouplingTimeDiscretizationTemplate<int>;
 
 const char MEDCouplingTimeDiscretizationInt::REPR[]="One time label.";