summaryrefslogtreecommitdiff
path: root/gi
diff options
context:
space:
mode:
authorPhilip Chimento <philip.chimento@gmail.com>2022-07-24 23:51:02 -0700
committerPhilip Chimento <philip.chimento@gmail.com>2022-07-25 20:45:17 -0700
commitef14a8a445cb5c596144309795c37436cb653b90 (patch)
treee42489e628c12cc48311e868db68bcd6ff53f017 /gi
parent8f49b9b666be21c9f565b3a40fb0a0a5b7ecf1a5 (diff)
downloadgjs-ef14a8a445cb5c596144309795c37436cb653b90.tar.gz
maint: Bring headers in line with IWYU 0.18
As with every release, IWYU's algorithms have slightly changed, and some bugs have been fixed meaning we can remove some workarounds from the postprocessing script; unfortunately other bugs have appeared as well.
Diffstat (limited to 'gi')
-rw-r--r--gi/boxed.h4
-rw-r--r--gi/closure.h1
-rw-r--r--gi/function.h2
-rw-r--r--gi/object.h4
-rw-r--r--gi/union.cpp1
-rw-r--r--gi/utils-inl.h2
6 files changed, 3 insertions, 11 deletions
diff --git a/gi/boxed.h b/gi/boxed.h
index 29a0d9d6..ef2404a6 100644
--- a/gi/boxed.h
+++ b/gi/boxed.h
@@ -15,6 +15,7 @@
#include <glib-object.h>
#include <glib.h>
+#include <js/AllocPolicy.h>
#include <js/GCHashTable.h> // for GCHashMap
#include <js/HashTable.h> // for DefaultHasher
#include <js/Id.h>
@@ -33,9 +34,6 @@ class JSTracer;
namespace JS {
class CallArgs;
}
-namespace js {
-class SystemAllocPolicy;
-}
/* To conserve memory, we have two different kinds of private data for GBoxed
* JS wrappers: BoxedInstance, and BoxedPrototype. Both inherit from BoxedBase
diff --git a/gi/closure.h b/gi/closure.h
index a9110fc5..a13e040a 100644
--- a/gi/closure.h
+++ b/gi/closure.h
@@ -12,7 +12,6 @@
#include <glib-object.h>
#include <stddef.h>
-#include <js/RootingAPI.h>
#include <js/TypeDecls.h>
#include "gi/utils-inl.h"
diff --git a/gi/function.h b/gi/function.h
index b70c7e29..5db20ec8 100644
--- a/gi/function.h
+++ b/gi/function.h
@@ -14,13 +14,13 @@
#include <ffi.h>
#include <girepository.h>
+#include <girffi.h> // for g_callable_info_get_closure_native_address
#include <glib-object.h>
#include <glib.h>
#include <js/GCVector.h>
#include <js/RootingAPI.h>
#include <js/TypeDecls.h>
-#include <js/Value.h> // IWYU pragma: keep
#include "gi/closure.h"
#include "gjs/jsapi-util.h"
diff --git a/gi/object.h b/gi/object.h
index f73e7358..0985845e 100644
--- a/gi/object.h
+++ b/gi/object.h
@@ -17,6 +17,7 @@
#include <glib-object.h>
#include <glib.h>
+#include <js/AllocPolicy.h>
#include <js/GCHashTable.h> // for GCHashMap
#include <js/HashTable.h> // for DefaultHasher
#include <js/Id.h>
@@ -38,9 +39,6 @@ class JSTracer;
namespace JS {
class CallArgs;
}
-namespace js {
-class SystemAllocPolicy;
-}
namespace Gjs {
namespace Test {
struct ObjectInstance;
diff --git a/gi/union.cpp b/gi/union.cpp
index 0b310ed1..5096f7a5 100644
--- a/gi/union.cpp
+++ b/gi/union.cpp
@@ -5,7 +5,6 @@
#include <config.h>
#include <girepository.h>
-#include <glib.h> // for g_atomic_rc_box_acquire, ...
#include <js/CallArgs.h>
#include <js/Class.h>
diff --git a/gi/utils-inl.h b/gi/utils-inl.h
index 96a17da3..e7b6c734 100644
--- a/gi/utils-inl.h
+++ b/gi/utils-inl.h
@@ -8,8 +8,6 @@
#include <stdint.h>
-#include <algorithm> // IWYU pragma: keep (for find)
-#include <type_traits> // IWYU pragma: keep
#include <utility> // IWYU pragma: keep (for swap)
#include <vector>