From 908dec7e12a2f5268aaa73ebe5495f7d4d9b7540 Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@loria.fr>
Date: Sat, 31 Mar 2018 00:46:01 +0200
Subject: [PATCH] reduce the visibility of xbt/config.hpp file to the cpp that
 really need it

---
 src/smpi/colls/smpi_coll.cpp       | 3 ++-
 src/smpi/include/SmpiHost.hpp      | 1 -
 src/smpi/include/private.hpp       | 1 -
 src/smpi/internals/SmpiHost.cpp    | 3 ++-
 src/smpi/internals/smpi_bench.cpp  | 2 ++
 src/smpi/internals/smpi_shared.cpp | 2 ++
 src/smpi/mpi/smpi_request.cpp      | 1 +
 7 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/smpi/colls/smpi_coll.cpp b/src/smpi/colls/smpi_coll.cpp
index 360603840a..59425a3777 100644
--- 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                 */
 
-/* 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. */
@@ -11,6 +11,7 @@
 #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)");
 
diff --git a/src/smpi/include/SmpiHost.hpp b/src/smpi/include/SmpiHost.hpp
index 024bb9277d..2a88bba2e8 100644
--- 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 <xbt/config.hpp>
 
 namespace simgrid {
 namespace smpi {
diff --git a/src/smpi/include/private.hpp b/src/smpi/include/private.hpp
index 7eebf7a743..5173964b89 100644
--- a/src/smpi/include/private.hpp
+++ b/src/smpi/include/private.hpp
@@ -6,7 +6,6 @@
 #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"
diff --git a/src/smpi/internals/SmpiHost.cpp b/src/smpi/internals/SmpiHost.cpp
index 827eb7601c..016072846f 100644
--- 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. */
@@ -6,6 +6,7 @@
 #include "SmpiHost.hpp"
 #include "simgrid/s4u/VirtualMachine.hpp"
 #include "smpi_utils.hpp"
+#include "xbt/config.hpp"
 
 #include <string>
 #include <vector>
diff --git a/src/smpi/internals/smpi_bench.cpp b/src/smpi/internals/smpi_bench.cpp
index 5f8f451271..52ae841f52 100644
--- 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 "xbt/config.hpp"
+
 #include <unordered_map>
 
 #ifndef WIN32
diff --git a/src/smpi/internals/smpi_shared.cpp b/src/smpi/internals/smpi_shared.cpp
index b4f18ebe0c..44f6ebbf0e 100644
--- a/src/smpi/internals/smpi_shared.cpp
+++ b/src/smpi/internals/smpi_shared.cpp
@@ -37,6 +37,8 @@
 #include <cstring>
 
 #include "private.hpp"
+#include "xbt/config.hpp"
+
 #include <cerrno>
 
 #include <sys/types.h>
diff --git a/src/smpi/mpi/smpi_request.cpp b/src/smpi/mpi/smpi_request.cpp
index cff18d4fc7..30feded131 100644
--- 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 "xbt/config.hpp"
 
 #include <algorithm>
 
-- 
2.20.1