From 36024389103014139bac26bec335f5521ef2466d Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Tue, 15 Feb 2022 01:46:13 +0000
Subject: Tidy includes

---
 icetray/dryice/dryice.h                         | 1 +
 icetray/icetray/abstractCachingDatabaseClient.h | 2 ++
 icetray/icetray/defaultPool.cpp                 | 1 +
 icetray/icetray/icetrayService.h                | 4 ++--
 icetray/icetray/logger.cpp                      | 2 --
 icetray/icetray/logger.h                        | 5 +++--
 icetray/icetray/options.cpp                     | 1 -
 icetray/icetray/options.h                       | 4 ++--
 icetray/tool/icetraySql.cpp                     | 2 --
 icetray/unittests/testIceTrayLogger.cpp         | 1 +
 iwyu.json                                       | 2 +-
 11 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/icetray/dryice/dryice.h b/icetray/dryice/dryice.h
index 174537a..931f93d 100644
--- a/icetray/dryice/dryice.h
+++ b/icetray/dryice/dryice.h
@@ -10,6 +10,7 @@
 #include <Ice/Proxy.h>
 #include <c++11Helpers.h>
 #include <memory>
+#include <plugins.h>
 #include <string>
 #include <typeinfo>
 #include <utility>
diff --git a/icetray/icetray/abstractCachingDatabaseClient.h b/icetray/icetray/abstractCachingDatabaseClient.h
index 890c9fd..c3d6ea3 100644
--- a/icetray/icetray/abstractCachingDatabaseClient.h
+++ b/icetray/icetray/abstractCachingDatabaseClient.h
@@ -16,6 +16,8 @@
 #include <vector>
 #include <visibility.h>
 // IWYU pragma: no_include "cache.impl.h"
+// IWYU pragma: no_include <boost/multi_index/detail/bidir_node_iterator.hpp>
+// IWYU pragma: no_include <boost/operators.hpp>
 
 namespace IceTray {
 	class DLL_PUBLIC AbstractCachingDatabaseClient : public AbstractDatabaseClient {
diff --git a/icetray/icetray/defaultPool.cpp b/icetray/icetray/defaultPool.cpp
index d1fa19b..3105877 100644
--- a/icetray/icetray/defaultPool.cpp
+++ b/icetray/icetray/defaultPool.cpp
@@ -6,6 +6,7 @@
 #include <factory.h>
 #include <memory>
 #include <string>
+// IWYU pragma: no_include "plugins.impl.h"
 
 namespace IceTray {
 	DefaultPool::DefaultPool(const std::string & name, const std::string & type, const Ice::PropertiesPtr & p) :
diff --git a/icetray/icetray/icetrayService.h b/icetray/icetray/icetrayService.h
index f331ece..14a6c7f 100644
--- a/icetray/icetray/icetrayService.h
+++ b/icetray/icetray/icetrayService.h
@@ -10,12 +10,12 @@
 #include <IceBox/IceBox.h>
 #include <c++11Helpers.h>
 #include <connectionPool.h>
-#include <factory.h>
+#include <factory.h> // IWYU pragma: keep
 #include <memory>
-#include <plugins.h>
 #include <set>
 #include <string>
 #include <visibility.h>
+// IWYU pragma: no_include "factory.impl.h"
 
 namespace IceTray {
 	class DLL_PUBLIC Service : public IceBox::Service, public AdHoc::AbstractPluginImplementation {
diff --git a/icetray/icetray/logger.cpp b/icetray/icetray/logger.cpp
index 5828ce0..b75d77e 100644
--- a/icetray/icetray/logger.cpp
+++ b/icetray/icetray/logger.cpp
@@ -7,9 +7,7 @@
 #include <boost/algorithm/string/detail/classification.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/split.hpp>
-#include <boost/core/addressof.hpp>
 #include <boost/format.hpp>
-#include <boost/function/function_base.hpp>
 #include <boost/iterator/iterator_facade.hpp>
 #include <boost/type_index/type_index_facade.hpp>
 #include <compileTimeFormatter.h>
diff --git a/icetray/icetray/logger.h b/icetray/icetray/logger.h
index 319c099..d625217 100644
--- a/icetray/icetray/logger.h
+++ b/icetray/icetray/logger.h
@@ -9,7 +9,7 @@
 #include <c++11Helpers.h>
 #include <compileTimeFormatter.h>
 #include <cstddef>
-#include <factory.h>
+#include <factory.h> // IWYU pragma: keep
 #include <logWriter.h>
 #include <map>
 #include <memory>
@@ -18,9 +18,10 @@
 #include <shared_mutex>
 #include <string>
 #include <sys/types.h>
-#include <type_traits>
 #include <typeinfo>
 #include <visibility.h>
+// IWYU pragma: no_include "factory.impl.h"
+// IWYU pragma: no_include <boost/test/unit_test.hpp>
 namespace Ice {
 	struct Current;
 }
diff --git a/icetray/icetray/options.cpp b/icetray/icetray/options.cpp
index e999881..fc44b8a 100644
--- a/icetray/icetray/options.cpp
+++ b/icetray/icetray/options.cpp
@@ -1,5 +1,4 @@
 #include "options.h"
-#include <algorithm>
 #include <boost/program_options/errors.hpp>
 #include <boost/program_options/option.hpp>
 #include <boost/program_options/parsers.hpp>
diff --git a/icetray/icetray/options.h b/icetray/icetray/options.h
index c41cd4b..30f9de2 100644
--- a/icetray/icetray/options.h
+++ b/icetray/icetray/options.h
@@ -4,13 +4,13 @@
 #include <Ice/Properties.h>
 #include <boost/program_options/options_description.hpp>
 #include <c++11Helpers.h>
-#include <factory.h>
+#include <factory.h> // IWYU pragma: keep
 #include <iosfwd>
 #include <memory>
-#include <plugins.impl.h>
 #include <string>
 #include <typeinfo>
 #include <visibility.h>
+// IWYU pragma: no_include "factory.impl.h"
 
 namespace IceTray {
 	using OptionsDescPtr = std::shared_ptr<boost::program_options::options_description>;
diff --git a/icetray/tool/icetraySql.cpp b/icetray/tool/icetraySql.cpp
index 265250a..37bec01 100644
--- a/icetray/tool/icetraySql.cpp
+++ b/icetray/tool/icetraySql.cpp
@@ -4,9 +4,7 @@
 #include <boost/algorithm/string/detail/classification.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/split.hpp>
-#include <boost/core/addressof.hpp>
 #include <boost/detail/basic_pointerbuf.hpp>
-#include <boost/function/function_base.hpp>
 #include <boost/iterator/iterator_facade.hpp>
 #include <boost/lexical_cast/bad_lexical_cast.hpp>
 #include <boost/program_options.hpp>
diff --git a/icetray/unittests/testIceTrayLogger.cpp b/icetray/unittests/testIceTrayLogger.cpp
index 5a436e8..9a8b2a6 100644
--- a/icetray/unittests/testIceTrayLogger.cpp
+++ b/icetray/unittests/testIceTrayLogger.cpp
@@ -21,6 +21,7 @@
 #include <string>
 #include <string_view>
 #include <vector>
+// IWYU pragma: no_include "plugins.impl.h"
 namespace Ice {
 	struct Current;
 }
diff --git a/iwyu.json b/iwyu.json
index 07d5709..d6ef209 100644
--- a/iwyu.json
+++ b/iwyu.json
@@ -80,6 +80,6 @@
 		]
 	},
 	{
-		"ref": "/usr/lib/llvm/12/share/include-what-you-use/boost-all-private.imp"
+		"ref": "/usr/lib/llvm/13/share/include-what-you-use/boost-all-private.imp"
 	}
 ]
-- 
cgit v1.2.3