reduce the visibility of xbt/config.hpp file to the cpp that really need it

diff --git a/src/smpi/colls/smpi_coll.cpp b/src/smpi/colls/smpi_coll.cpp
index 3606038..59425a3 100644 (file)
--- a/src/smpi/colls/smpi_coll.cpp
+++ b/src/smpi/colls/smpi_coll.cpp
@@ -1,6 +1,6 @@
 /* smpi_coll.c -- various optimized routing for collectives                 */
 
 /* smpi_coll.c -- various optimized routing for collectives                 */
 

-/* Copyright (c) 2009-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2009-2018. 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. */
 
 /* 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. */


@@ -11,6 +11,7 @@
 #include "smpi_datatype.hpp"
 #include "smpi_op.hpp"
 #include "smpi_request.hpp"
 #include "smpi_datatype.hpp"
 #include "smpi_op.hpp"
 #include "smpi_request.hpp"

+#include "xbt/config.hpp"

 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_coll, smpi, "Logging specific to SMPI (coll)");
 
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_coll, smpi, "Logging specific to SMPI (coll)");
 

diff --git a/src/smpi/include/SmpiHost.hpp b/src/smpi/include/SmpiHost.hpp
index 024bb92..2a88bba 100644 (file)
--- a/src/smpi/include/SmpiHost.hpp
+++ b/src/smpi/include/SmpiHost.hpp
@@ -12,7 +12,6 @@
 #include <string>
 #include <vector>
 #include <xbt/Extendable.hpp>
 #include <string>
 #include <vector>
 #include <xbt/Extendable.hpp>

-#include <xbt/config.hpp>

 
 namespace simgrid {
 namespace smpi {
 
 namespace simgrid {
 namespace smpi {

diff --git a/src/smpi/include/private.hpp b/src/smpi/include/private.hpp
index 7eebf7a..5173964 100644 (file)
--- a/src/smpi/include/private.hpp
+++ b/src/smpi/include/private.hpp
@@ -6,7 +6,6 @@
 #ifndef SMPI_PRIVATE_HPP
 #define SMPI_PRIVATE_HPP
 
 #ifndef SMPI_PRIVATE_HPP
 #define SMPI_PRIVATE_HPP
 

-#include "include/xbt/config.hpp"

 #include "simgrid/msg.h" // msg_bar_t
 #include "smpi/smpi.h"
 #include "src/instr/instr_smpi.hpp"
 #include "simgrid/msg.h" // msg_bar_t
 #include "smpi/smpi.h"
 #include "src/instr/instr_smpi.hpp"

diff --git a/src/smpi/internals/SmpiHost.cpp b/src/smpi/internals/SmpiHost.cpp
index 827eb76..0160728 100644 (file)
--- a/src/smpi/internals/SmpiHost.cpp
+++ b/src/smpi/internals/SmpiHost.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017. The SimGrid Team. All rights reserved.               */
+/* Copyright (c) 2017-2018. 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. */
 
 /* 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,6 +6,7 @@
 #include "SmpiHost.hpp"
 #include "simgrid/s4u/VirtualMachine.hpp"
 #include "smpi_utils.hpp"
 #include "SmpiHost.hpp"
 #include "simgrid/s4u/VirtualMachine.hpp"
 #include "smpi_utils.hpp"

+#include "xbt/config.hpp"

 
 #include <string>
 #include <vector>
 
 #include <string>
 #include <vector>

diff --git a/src/smpi/internals/smpi_bench.cpp b/src/smpi/internals/smpi_bench.cpp
index 5f8f451..52ae841 100644 (file)
--- a/src/smpi/internals/smpi_bench.cpp
+++ b/src/smpi/internals/smpi_bench.cpp
@@ -11,6 +11,8 @@
 #include "src/internal_config.h"
 #include "src/mc/mc_replay.hpp"
 #include "src/simix/ActorImpl.hpp"
 #include "src/internal_config.h"
 #include "src/mc/mc_replay.hpp"
 #include "src/simix/ActorImpl.hpp"

+#include "xbt/config.hpp"
+

 #include <unordered_map>
 
 #ifndef WIN32
 #include <unordered_map>
 
 #ifndef WIN32

diff --git a/src/smpi/internals/smpi_shared.cpp b/src/smpi/internals/smpi_shared.cpp
index b4f18eb..44f6ebb 100644 (file)
--- a/src/smpi/internals/smpi_shared.cpp
+++ b/src/smpi/internals/smpi_shared.cpp
@@ -37,6 +37,8 @@
 #include <cstring>
 
 #include "private.hpp"
 #include <cstring>
 
 #include "private.hpp"

+#include "xbt/config.hpp"
+

 #include <cerrno>
 
 #include <sys/types.h>
 #include <cerrno>
 
 #include <sys/types.h>

diff --git a/src/smpi/mpi/smpi_request.cpp b/src/smpi/mpi/smpi_request.cpp
index cff18d4..30feded 100644 (file)
--- a/src/smpi/mpi/smpi_request.cpp
+++ b/src/smpi/mpi/smpi_request.cpp
@@ -15,6 +15,7 @@
 #include "src/kernel/activity/CommImpl.hpp"
 #include "src/mc/mc_replay.hpp"
 #include "src/simix/ActorImpl.hpp"
 #include "src/kernel/activity/CommImpl.hpp"
 #include "src/mc/mc_replay.hpp"
 #include "src/simix/ActorImpl.hpp"

+#include "xbt/config.hpp"

 
 #include <algorithm>
 
 
 #include <algorithm>