Merge branch 'IwyuOnBaseLib' into 'master'

Update BaseLib's includes

See merge request ogs/ogs!4463

BaseLib/ConfigTree-impl.h

@@ -8,6 +8,8 @@
  *
  */
 
+// IWYU pragma: private, include "ConfigTree.h"
+
 #include <sstream>
 #include <utility>
 

BaseLib/ConfigTree.cpp

@@ -10,6 +10,7 @@
 
 #include "ConfigTree.h"
 
+#include <cstddef>
 #include <forward_list>
 #include <utility>
 

BaseLib/ConfigTree.h

@@ -12,6 +12,8 @@
 
 #include <boost/property_tree/ptree.hpp>
 #include <functional>
+#include <iosfwd>
+#include <iterator>
 #include <map>
 #include <memory>
 #include <optional>
@@ -688,4 +690,4 @@ private:
 
 }  // namespace BaseLib
 
-#include "ConfigTree-impl.h"
+#include "ConfigTree-impl.h"  // IWYU pragma: keep

BaseLib/ConfigTreeUtil.cpp

@@ -10,9 +10,12 @@
 
 #include "ConfigTreeUtil.h"
 
+#include <boost/operators.hpp>
 #include <boost/property_tree/xml_parser.hpp>
-#include <regex>
+#include <ostream>
+#include <utility>
 
+#include "ConfigTree.h"
 #include "Error.h"
 #include "Logging.h"
 

BaseLib/ConfigTreeUtil.h

@@ -10,6 +10,9 @@
 
 #pragma once
 
+#include <iosfwd>
+#include <string>
+
 #include "ConfigTree.h"
 
 namespace BaseLib

BaseLib/FileTools.cpp

@@ -14,12 +14,15 @@
 
 #include "FileTools.h"
 
-#include <boost/algorithm/string.hpp>
+#include <spdlog/fmt/bundled/core.h>
+
+#include <boost/algorithm/string/predicate.hpp>
 #include <filesystem>
 #include <fstream>
 #include <typeindex>
 #include <unordered_map>
 
+#include "BaseLib/Logging.h"
 #include "Error.h"
 
 namespace

BaseLib/FileTools.h

@@ -14,8 +14,10 @@
 
 #pragma once
 
+#include <cstddef>
 #include <iosfwd>
 #include <string>
+#include <tuple>
 #include <vector>
 
 namespace BaseLib

BaseLib/Histogram.cpp

@@ -10,6 +10,7 @@
 
 #include "Histogram.h"
 
+#include <cmath>
 #include <fstream>
 
 #include "BaseLib/Logging.h"

BaseLib/Histogram.h

@@ -13,8 +13,9 @@
 #pragma once
 
 #include <algorithm>
-#include <cmath>
+#include <cstddef>
 #include <iosfwd>
+#include <iterator>
 #include <string>
 #include <utility>
 #include <vector>

BaseLib/IO/readStringListFromFile.cpp

@@ -7,7 +7,7 @@
  *              http://www.opengeosys.org/project/license
  */
 
-#include "BaseLib/IO/readStringListFromFile.h"
+#include "readStringListFromFile.h"
 
 #include <fstream>
 

BaseLib/Logging.cpp

@@ -11,9 +11,11 @@
 
 #include "Logging.h"
 
+#include <spdlog/common.h>
 #include <spdlog/sinks/stdout_color_sinks.h>
 #include <spdlog/spdlog.h>
 
+#include <exception>
 #include <iostream>
 #include <map>
 

BaseLib/Logging.h

@@ -15,6 +15,7 @@
 
 #include <memory>
 #include <string>
+#include <utility>
 
 #include "baselib_export.h"
 

BaseLib/MemWatch.cpp

@@ -15,7 +15,7 @@
 #include "MemWatch.h"
 
 #if !defined(_WIN32) && !defined(__APPLE__) && !defined(__MINGW32__)
-#include <sys/types.h>
+#include <stdio.h>
 #include <unistd.h>
 
 #include <fstream>

BaseLib/PrjProcessing.cpp

@@ -10,14 +10,14 @@
 
 #include "PrjProcessing.h"
 
+#include <libxml/globals.h>
 #include <libxml/parser.h>
-#include <libxml/tree.h>
+#include <libxml/xmlstring.h>
 #include <xml_patch.h>
 
 #include <filesystem>
 #include <fstream>
 #include <regex>
-#include <sstream>
 
 #include "DisableFPE.h"
 #include "Error.h"

BaseLib/PrjProcessing.h

@@ -11,6 +11,7 @@
 #pragma once
 
 #include <iosfwd>
+#include <string>
 #include <vector>
 
 namespace BaseLib

BaseLib/StringTools.cpp

@@ -16,11 +16,10 @@
 
 #include <algorithm>
 #include <boost/algorithm/string/replace.hpp>
-#include <cctype>
 #include <chrono>
 #include <cstdarg>
 #include <cstdio>
-#include <iomanip>
+#include <iterator>
 #include <random>
 
 namespace BaseLib

BaseLib/StringTools.h

@@ -14,6 +14,7 @@
 
 #pragma once
 
+#include <cstddef>
 #include <list>
 #include <sstream>
 #include <string>

BaseLib/Subdivision.h

@@ -10,6 +10,7 @@
 
 #pragma once
 
+#include <cstddef>
 #include <vector>
 
 namespace BaseLib

BaseLib/TimeInterval.cpp

@@ -14,6 +14,8 @@
 
 #include "TimeInterval.h"
 
+#include <memory>
+
 #include "ConfigTree.h"
 
 namespace BaseLib