From: Martin Quinson <martin.quinson@loria.fr>
Date: Thu, 25 Jan 2018 19:14:37 +0000 (+0100)
Subject: get ns3 to compile (but still fails)
X-Git-Tag: v3.19~301
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/a379f8a8381c6acf5ef1b29bca69cd758410c4c6

get ns3 to compile (but still fails)
---

diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp
index c6a2fda4a1..f7c56ae2aa 100644
--- a/src/surf/network_ns3.cpp
+++ b/src/surf/network_ns3.cpp
@@ -230,7 +230,7 @@ void NetworkNS3Model::updateActionsState(double now, double delta)
 
     if(sgFlow->finished_){
       socket_to_destroy.push_back(ns3Socket);
-      XBT_DEBUG("Destroy socket %p of action %p", ns3Socket, action);
+      XBT_DEBUG("Destroy socket %p of action %p", ns3Socket.c_str(), action);
       action->finish(Action::State::done);
     }
   }
@@ -240,7 +240,7 @@ void NetworkNS3Model::updateActionsState(double now, double delta)
     socket_to_destroy.pop_back();
     SgFlow* flow = flowFromSock.at(ns3Socket);
     if (XBT_LOG_ISENABLED(ns3, xbt_log_priority_debug)) {
-      XBT_DEBUG ("Removing socket %p of action %p", ns3Socket, flow->action_);
+      XBT_DEBUG("Removing socket %p of action %p", ns3Socket.c_str(), flow->action_);
     }
     delete flow;
     flowFromSock.erase(ns3Socket);
diff --git a/tools/cmake/GCCFlags.cmake b/tools/cmake/GCCFlags.cmake
index d00bb4039d..8b4b980a15 100644
--- a/tools/cmake/GCCFlags.cmake
+++ b/tools/cmake/GCCFlags.cmake
@@ -180,6 +180,11 @@ if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_XOPEN_SOURCE=700 -D_DARWIN_C_SOURCE")
 endif()
 
+# Avoid a failure seen with gcc 7.2.0 and ns3 3.27
+if(enable_ns3)
+  set_source_files_properties(src/surf/network_ns3.cpp PROPERTIES COMPILE_FLAGS " -Wno-unused-local-typedef")  
+endif()
+
 set(TESH_OPTION "")
 if(enable_coverage)
   find_program(GCOV_PATH gcov)