Fix circular #include

refs #6985

diff --git a/lib/base/exception.cpp b/lib/base/exception.cpp
index d0e363e61231080185df7079f7422a273dbb802b..ade4702b3a1d5d2a4dfc6ab7caf9e6c35250d179 100644 (file)
--- a/lib/base/exception.cpp
+++ b/lib/base/exception.cpp
@@ -1,6 +1,7 @@
 /* Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+ */
 
 #include "base/exception.hpp"
+#include <boost/thread/tss.hpp>
 
 #ifdef HAVE_CXXABI_H
 #      include <cxxabi.h>

diff --git a/lib/base/exception.hpp b/lib/base/exception.hpp
index 47e53dac54c67ad90c02849dcc929b6610f8ac5e..5daa0c85c65b3e8d2933323554722f596e99c641 100644 (file)
--- a/lib/base/exception.hpp
+++ b/lib/base/exception.hpp
@@ -7,7 +7,6 @@
 #include "base/string.hpp"
 #include "base/stacktrace.hpp"
 #include "base/context.hpp"
-#include "base/utility.hpp"
 #include "base/debuginfo.hpp"
 #include "base/dictionary.hpp"
 #include "base/configobject.hpp"

diff --git a/lib/base/scriptglobal.cpp b/lib/base/scriptglobal.cpp
index d4ac81e9ffa027d6153de7d1a687f8feef3bd5f6..4b5caa444eab10f7d2f2abac0a1450e886788fa1 100644 (file)
--- a/lib/base/scriptglobal.cpp
+++ b/lib/base/scriptglobal.cpp
@@ -10,6 +10,7 @@
 #include "base/objectlock.hpp"
 #include "base/exception.hpp"
 #include "base/namespace.hpp"
+#include "base/utility.hpp"
 #include <fstream>
 
 using namespace icinga;

diff --git a/lib/base/socketevents-epoll.cpp b/lib/base/socketevents-epoll.cpp
index f241b54af7c0fdf357ac1e8cbecb61e5c4c471a8..0e75ee5e81fc6bb09b91c246117eaf3c1321e128 100644 (file)
--- a/lib/base/socketevents-epoll.cpp
+++ b/lib/base/socketevents-epoll.cpp
@@ -3,6 +3,7 @@
 #include "base/socketevents.hpp"
 #include "base/exception.hpp"
 #include "base/logger.hpp"
+#include "base/utility.hpp"
 #include <boost/thread/once.hpp>
 #include <map>
 #ifdef __linux__

diff --git a/lib/base/socketevents-poll.cpp b/lib/base/socketevents-poll.cpp
index 4b12316b2752c2f7505ca29148a995f7898ed53b..f8200d4353e7ea47445996d6bbcb7700c5297302 100644 (file)
--- a/lib/base/socketevents-poll.cpp
+++ b/lib/base/socketevents-poll.cpp
@@ -3,6 +3,7 @@
 #include "base/socketevents.hpp"
 #include "base/exception.hpp"
 #include "base/logger.hpp"
+#include "base/utility.hpp"
 #include <boost/thread/once.hpp>
 #include <map>
 

diff --git a/lib/base/socketevents.cpp b/lib/base/socketevents.cpp
index 1d31b466219e2435db456f7c1a68d13f356952b5..f79d4218dccc8a8a21b81fd595c5f6f3d7267b7e 100644 (file)
--- a/lib/base/socketevents.cpp
+++ b/lib/base/socketevents.cpp
@@ -5,6 +5,7 @@
 #include "base/logger.hpp"
 #include "base/application.hpp"
 #include "base/scriptglobal.hpp"
+#include "base/utility.hpp"
 #include <boost/thread/once.hpp>
 #include <map>
 #ifdef __linux__

diff --git a/lib/cli/apisetuputility.cpp b/lib/cli/apisetuputility.cpp
index cee4e1ee3ddc1518b50f5c80d553e3a9660c5ba5..448069d5e726da2ea9c435246a345c5c17977978 100644 (file)
--- a/lib/cli/apisetuputility.cpp
+++ b/lib/cli/apisetuputility.cpp
@@ -11,6 +11,7 @@
 #include "base/tlsutility.hpp"
 #include "base/scriptglobal.hpp"
 #include "base/exception.hpp"
+#include "base/utility.hpp"
 #include <boost/algorithm/string/join.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/algorithm/string/case_conv.hpp>

diff --git a/lib/config/configcompilercontext.cpp b/lib/config/configcompilercontext.cpp
index 4a04b258b8c89bd3af312fb3d80acb9205ac915a..77aa3f065a6e23bef2526717f31a5b43a9c97415 100644 (file)
--- a/lib/config/configcompilercontext.cpp
+++ b/lib/config/configcompilercontext.cpp
@@ -6,6 +6,7 @@
 #include "base/netstring.hpp"
 #include "base/exception.hpp"
 #include "base/application.hpp"
+#include "base/utility.hpp"
 
 using namespace icinga;
 

diff --git a/lib/config/configitem.cpp b/lib/config/configitem.cpp
index 1c3b950d7a655f1922c6003d5ae36cfe8b8fa77a..a7c960c9b709bb2bb4443105121c1d4e507c4a9f 100644 (file)
--- a/lib/config/configitem.cpp
+++ b/lib/config/configitem.cpp
@@ -19,6 +19,7 @@
 #include "base/json.hpp"
 #include "base/exception.hpp"
 #include "base/function.hpp"
+#include "base/utility.hpp"
 #include <boost/algorithm/string/join.hpp>
 #include <sstream>
 #include <fstream>

diff --git a/lib/remote/apilistener-filesync.cpp b/lib/remote/apilistener-filesync.cpp
index 9e73c9bb818d10fbfd82067f39ebe3ae55098a2f..87aae61044bfe13c3a7a411eb7c0c9f6b00d4c7f 100644 (file)
--- a/lib/remote/apilistener-filesync.cpp
+++ b/lib/remote/apilistener-filesync.cpp
@@ -7,6 +7,7 @@
 #include "base/logger.hpp"
 #include "base/convert.hpp"
 #include "base/exception.hpp"
+#include "base/utility.hpp"
 #include <fstream>
 #include <iomanip>
 

diff --git a/lib/remote/configfileshandler.cpp b/lib/remote/configfileshandler.cpp
index d4c761c7b4db3467080b15284c3fa5e4df727372..d714f4d864abc3cf7b26afea79177533a874b631 100644 (file)
--- a/lib/remote/configfileshandler.cpp
+++ b/lib/remote/configfileshandler.cpp
@@ -5,6 +5,7 @@
 #include "remote/httputility.hpp"
 #include "remote/filterutility.hpp"
 #include "base/exception.hpp"
+#include "base/utility.hpp"
 #include <boost/algorithm/string/join.hpp>
 #include <fstream>
 

diff --git a/lib/remote/configobjectutility.cpp b/lib/remote/configobjectutility.cpp
index d16f887a7604f1b04ecf4a3b638415511bc006d0..e1d52d8dac5cd790c0293d0f305e0dd4beef3af1 100644 (file)
--- a/lib/remote/configobjectutility.cpp
+++ b/lib/remote/configobjectutility.cpp
@@ -8,6 +8,7 @@
 #include "base/configwriter.hpp"
 #include "base/exception.hpp"
 #include "base/dependencygraph.hpp"
+#include "base/utility.hpp"
 #include <boost/algorithm/string/case_conv.hpp>
 #include <fstream>
 

diff --git a/lib/remote/consolehandler.cpp b/lib/remote/consolehandler.cpp
index 0f0fddc8f605e159da5363a687f11fca04a9a9e4..e836f884479c7326cf088eab47af5b9df6ead22b 100644 (file)
--- a/lib/remote/consolehandler.cpp
+++ b/lib/remote/consolehandler.cpp
@@ -12,6 +12,7 @@
 #include "base/timer.hpp"
 #include "base/namespace.hpp"
 #include "base/initialize.hpp"
+#include "base/utility.hpp"
 #include <boost/thread/once.hpp>
 #include <set>
 

diff --git a/lib/remote/filterutility.cpp b/lib/remote/filterutility.cpp
index f7bfa1e99941a4f48296824836d9ef26246b9ab6..c4579cf955150a6584b2204aa9ed925c739e1d5f 100644 (file)
--- a/lib/remote/filterutility.cpp
+++ b/lib/remote/filterutility.cpp
@@ -8,6 +8,7 @@
 #include "base/json.hpp"
 #include "base/configtype.hpp"
 #include "base/logger.hpp"
+#include "base/utility.hpp"
 #include <boost/algorithm/string/case_conv.hpp>
 
 using namespace icinga;

diff --git a/plugins/check_nscp_api.cpp b/plugins/check_nscp_api.cpp
index 6619b960e2166f4a4d8bc4c888a09742de856e55..f800fccd8f992d76395ac64585aa0a3d34308599 100644 (file)
--- a/plugins/check_nscp_api.cpp
+++ b/plugins/check_nscp_api.cpp
@@ -10,6 +10,7 @@
 #include "base/string.hpp"
 #include "base/logger.hpp"
 #include "base/exception.hpp"
+#include "base/utility.hpp"
 #include <boost/program_options.hpp>
 #include <boost/algorithm/string/split.hpp>
 #include <iostream>