From: Martin Quinson <martin.quinson@loria.fr>
Date: Sat, 25 Jul 2015 12:44:06 +0000 (+0200)
Subject: get it to compile on clang on my machine
X-Git-Tag: v3_12~404
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/716316f298a4ca2fbbfaa38e138d9f03cd31d061?hp=3f39df9e2a9e798f07a880c9a03ec8fe20dabe79

get it to compile on clang on my machine
---

diff --git a/buildtools/Cmake/Flags.cmake b/buildtools/Cmake/Flags.cmake
index dcf37d85ee..f42cc80752 100644
--- a/buildtools/Cmake/Flags.cmake
+++ b/buildtools/Cmake/Flags.cmake
@@ -22,6 +22,9 @@ if(enable_compile_warnings)
   if(CMAKE_COMPILER_IS_GNUCXX)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wclobbered -Wno-error=clobbered")
   endif()
+  if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") # don't care about class that become struct
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-mismatched-tags")
+  endif()
 
   set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -Wall") # FIXME: Q&D hack
 
@@ -96,8 +99,7 @@ if(enable_msg_deprecated)
   set(CMAKE_C_FLAGS "-DMSG_USE_DEPRECATED ${CMAKE_C_FLAGS}")
 endif()
 
-set(CMAKE_C_FLAGS "${optCFLAGS} ${warnCFLAGS} ${CMAKE_C_FLAGS}")
-
+set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   ${optCFLAGS} ${warnCFLAGS}")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${optCFLAGS}")
 
 # Try to make Mac a bit more complient to open source standards
diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp
index ff805e4a22..1789ba5339 100644
--- a/src/surf/network_cm02.hpp
+++ b/src/surf/network_cm02.hpp
@@ -30,10 +30,7 @@ class NetworkCm02Model : public NetworkModel {
 private:
   void initialize();
 public:
-  NetworkCm02Model(int /*i*/) : NetworkModel() {
-	f_networkSolve = lmm_solve;
-	m_haveGap = false;
-  };//FIXME: add network clean interface
+  NetworkCm02Model(int /*i*/) : NetworkModel() {};
   NetworkCm02Model();
   ~NetworkCm02Model() {
   }
diff --git a/src/surf/network_smpi.hpp b/src/surf/network_smpi.hpp
index 6d7bd4462a..6ae0b19c7f 100644
--- a/src/surf/network_smpi.hpp
+++ b/src/surf/network_smpi.hpp
@@ -25,6 +25,7 @@ public:
   NetworkSmpiModel();
   ~NetworkSmpiModel();
 
+  using NetworkModel::gapAppend; // Explicit about overloaded method (silence Woverloaded-virtual from clang)
   void gapAppend(double size, Link* link, NetworkAction *action);
   void gapRemove(Action *action);
   double latencyFactor(double size);