activity::CommImpl: stick to our naming standards for the fields

[simgrid.git] / src / smpi / smpicxx.in

diff --git a/src/smpi/smpicxx.in b/src/smpi/smpicxx.in
index c5abb46..6f2e46a 100755 (executable)
--- a/src/smpi/smpicxx.in
+++ b/src/smpi/smpicxx.in
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# Copyright (c) 2014-2017. The SimGrid Team.
+# Copyright (c) 2014-2019. The SimGrid Team.
 # All rights reserved.
 
 # This program is free software; you can redistribute it and/or modify it
@@ -16,20 +16,20 @@ CMAKE_LINKARGS="-L@libdir@"
 
 @SMPITOOLS_SH@
 
-list_set CXXFLAGS
+list_set CXXFLAGS "-std=gnu++11"
 list_set LINKARGS
 if [ "@WIN32@" != "1" ]; then
-    # list_add CXXFLAGS "-Dmain=smpi_simulated_main_"
-    list_add CXXFLAGS "-fpic" "-std=gnu++11"
+    # list_add CXXFLAGS "-include" "@includedir@/smpi/smpi_helpers.h"
+    list_add CXXFLAGS "-fpic"
     if [ "x${SMPI_PRETEND_CC}" = "x" ]; then
        list_add LINKARGS "-shared"
     else
        echo "Warning: smpicxx pretends to be a regular compiler (SMPI_PRETEND_CC is set). Produced binaries will not be usable in SimGrid."
     fi
-    list_add LINKARGS "-lsimgrid" "-std=gnu++11"
+    list_add LINKARGS "-lsimgrid"
 else
-    list_add CXXFLAGS "-include" "@includedir@/smpi/smpi_main.h" "-std=gnu++11"
-    list_add LINKARGS "@libdir@\libsimgrid.dll" "-std=gnu++11"
+    list_add CXXFLAGS "-include" "@includedir@/smpi/smpi_main.h"
+    list_add LINKARGS "@libdir@\libsimgrid.dll"
 fi
 
 list_set CMDARGS