Merge branch 'master' into depencencies

[simgrid.git] / src / smpi / internals / smpi_config.cpp

diff --git a/src/smpi/internals/smpi_config.cpp b/src/smpi/internals/smpi_config.cpp
index 68f3b67e014dda33cf3998d27cafe31d17a52104..7bd5640a187fcafd3333ff55832e774ea030b492 100644 (file)
--- a/src/smpi/internals/smpi_config.cpp
+++ b/src/smpi/internals/smpi_config.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2008-2020. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -6,11 +6,15 @@
 #include "include/xbt/config.hpp"
 #include "private.hpp"
 #include "smpi_coll.hpp"
+#include "smpi_config.hpp"
 #include "src/simix/smx_private.hpp"
 #include <cfloat> /* DBL_MAX */
 #include <boost/algorithm/string.hpp> /* trim */
 #include <boost/tokenizer.hpp>
 
+#if SIMGRID_HAVE_MC
+#include "src/mc/mc_config.hpp"
+#endif
 
 #if defined(__APPLE__)
 # include <AvailabilityMacros.h>
@@ -242,7 +246,6 @@ void smpi_init_options(){
   simgrid::config::alias("smpi/privatization", {"smpi/privatize_global_variables", "smpi/privatize-global-variables"});
   simgrid::config::alias("smpi/reduce_scatter", {"smpi/reduce-scatter"});
   _smpi_options_initialized=true;
-
 }
 
 void smpi_check_options()