include/IwyuFilter_include.yaml   |   15 +++++++++------
 include/o3tl/char16_t2wchar_t.hxx |    2 ++
 include/o3tl/compare.hxx          |    7 +++++--
 include/o3tl/enumarray.hxx        |    4 +---
 include/o3tl/hash_combine.hxx     |    1 -
 include/o3tl/make_shared.hxx      |    1 -
 include/o3tl/nonstaticstring.hxx  |    2 --
 include/o3tl/sorted_vector.hxx    |    1 -
 include/o3tl/sprintf.hxx          |    1 -
 9 files changed, 17 insertions(+), 17 deletions(-)

New commits:
commit c1946a911ffae1446336c46df066d0a2889675e2
Author:     Gabor Kelemen <[email protected]>
AuthorDate: Mon Oct 20 20:18:16 2025 +0200
Commit:     Gabor Kelemen <[email protected]>
CommitDate: Sun Nov 23 19:25:21 2025 +0100

    tdf#146619 Run IWYU again on include/o3tl
    
    Change-Id: Ied0d3675a517df858d4d50340abb53636b2d450f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192746
    Tested-by: Jenkins
    Reviewed-by: Gabor Kelemen <[email protected]>

diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index f4e095521f2c..f085ca521c0a 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -240,15 +240,18 @@ excludelist:
     - com/sun/star/lang/XServiceInfo.hpp
     - com/sun/star/rendering/XBezierPolyPolygon2D.hpp
     - com/sun/star/rendering/XLinePolyPolygon2D.hpp
-    include/o3tl/char16_t2wchar_t.hxx:
-    # Needed on WIN32
-    - string_view
-    include/o3tl/make_shared.hxx:
-    # Needed for __COVERITY__
-    - o3tl/deleter.hxx
+    include/o3tl/float_int_conversion.hxx:
+    # Don't replace with std <concepts>
+    - o3tl/concepts.hxx
+    include/o3tl/numeric.hxx:
+    # Don't replace with std <concepts>
+    - o3tl/concepts.hxx
     include/o3tl/safeint.hxx:
     # Needed for std::min
     - algorithm
+    include/o3tl/strong_int.hxx:
+    # Needed for operator<=> needs std::strong_ordering
+    - compare
     include/o3tl/unreachable.hxx:
     # Needed for C++23 mode
     - utility
diff --git a/include/o3tl/char16_t2wchar_t.hxx 
b/include/o3tl/char16_t2wchar_t.hxx
index c2640f627109..494ae6d14dd0 100644
--- a/include/o3tl/char16_t2wchar_t.hxx
+++ b/include/o3tl/char16_t2wchar_t.hxx
@@ -11,7 +11,9 @@
 
 #include <sal/config.h>
 
+#if defined _WIN32
 #include <string_view>
+#endif
 
 namespace o3tl
 {
diff --git a/include/o3tl/compare.hxx b/include/o3tl/compare.hxx
index 2b0db4e5be93..ed46f30f5095 100644
--- a/include/o3tl/compare.hxx
+++ b/include/o3tl/compare.hxx
@@ -11,13 +11,16 @@
 
 #include <sal/config.h>
 
+#include <config_global.h>
+
+#if HAVE_CPP_STRONG_ORDER
 #include <compare>
+#else
 #include <concepts>
 #include <cstdint>
 #include <cstring>
 #include <limits>
-
-#include <config_global.h>
+#endif
 
 namespace o3tl
 {
diff --git a/include/o3tl/enumarray.hxx b/include/o3tl/enumarray.hxx
index 016841eeaeed..922c962afe8f 100644
--- a/include/o3tl/enumarray.hxx
+++ b/include/o3tl/enumarray.hxx
@@ -20,11 +20,9 @@
 #ifndef INCLUDED_O3TL_ENUMARRAY_HXX
 #define INCLUDED_O3TL_ENUMARRAY_HXX
 
-#include <iterator>
-#include <type_traits>
 #include <utility>
 #include <array>
-#include <cassert>
+#include <cstddef>
 #include <concepts>
 
 namespace o3tl {
diff --git a/include/o3tl/hash_combine.hxx b/include/o3tl/hash_combine.hxx
index 80b2a7fa0825..7864881b293d 100644
--- a/include/o3tl/hash_combine.hxx
+++ b/include/o3tl/hash_combine.hxx
@@ -11,7 +11,6 @@
 
 #include <cstddef>
 #include <functional>
-#include <type_traits>
 #include <o3tl/concepts.hxx>
 
 namespace o3tl
diff --git a/include/o3tl/make_shared.hxx b/include/o3tl/make_shared.hxx
index 37b65c876659..1ee307ccfa44 100644
--- a/include/o3tl/make_shared.hxx
+++ b/include/o3tl/make_shared.hxx
@@ -10,7 +10,6 @@
 #ifndef INCLUDED_O3TL_MAKE_SHARED_HXX
 #define INCLUDED_O3TL_MAKE_SHARED_HXX
 
-#include <o3tl/deleter.hxx>
 #include <memory>
 #include <type_traits>
 
diff --git a/include/o3tl/nonstaticstring.hxx b/include/o3tl/nonstaticstring.hxx
index 064134e4d5aa..2ec8571aeb9b 100644
--- a/include/o3tl/nonstaticstring.hxx
+++ b/include/o3tl/nonstaticstring.hxx
@@ -11,8 +11,6 @@
 
 #include <sal/config.h>
 
-#include <string>
-
 #include <rtl/ustrbuf.hxx>
 #include <rtl/ustring.hxx>
 
diff --git a/include/o3tl/sorted_vector.hxx b/include/o3tl/sorted_vector.hxx
index bf28b7166e41..3d26034e2a0e 100644
--- a/include/o3tl/sorted_vector.hxx
+++ b/include/o3tl/sorted_vector.hxx
@@ -15,7 +15,6 @@
 #include <cassert>
 #include <functional>
 #include <iterator>
-#include <memory>
 #include <type_traits>
 
 namespace o3tl
diff --git a/include/o3tl/sprintf.hxx b/include/o3tl/sprintf.hxx
index 373fff744c91..6bc483aed21a 100644
--- a/include/o3tl/sprintf.hxx
+++ b/include/o3tl/sprintf.hxx
@@ -12,7 +12,6 @@
 #include <sal/config.h>
 
 #include <cassert>
-#include <cstddef>
 #include <cstdio>
 #include <utility>
 

Reply via email to