Skip to content

Commit 0f0b70b

Browse files
committedAug 8, 2022
iwyu: use imp file rather than intrusive pragma exports
1 parent e39f235 commit 0f0b70b

31 files changed

+61
-31
lines changed
 

‎entt.imp

+31-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,34 @@
11
[
22
{ "include": [ "@<gtest/internal/.*>", "private", "<gtest/gtest.h>", "public" ] },
3-
{ "include": [ "@<gtest/gtest-.*>", "private", "<gtest/gtest.h>", "public" ] }
3+
{ "include": [ "@<gtest/gtest-.*>", "private", "<gtest/gtest.h>", "public" ] },
4+
{ "include": [ "@[\"<].*/container/fwd.hpp[\">]", "private", "<entt/container/dense_map.hpp>", "public" ] },
5+
{ "include": [ "@[\"<].*/container/fwd.hpp[\">]", "private", "<entt/container/dense_set.hpp>", "public" ] },
6+
{ "include": [ "@[\"<].*/core/fwd.hpp[\">]", "private", "<entt/core/any.hpp>", "public" ] },
7+
{ "include": [ "@[\"<].*/core/fwd.hpp[\">]", "private", "<entt/core/family.hpp>", "public" ] },
8+
{ "include": [ "@[\"<].*/core/fwd.hpp[\">]", "private", "<entt/core/hashed_string.hpp>", "public" ] },
9+
{ "include": [ "@[\"<].*/core/fwd.hpp[\">]", "private", "<entt/core/ident.hpp>", "public" ] },
10+
{ "include": [ "@[\"<].*/core/fwd.hpp[\">]", "private", "<entt/core/monostate.hpp>", "public" ] },
11+
{ "include": [ "@[\"<].*/core/fwd.hpp[\">]", "private", "<entt/core/type_info.hpp>", "public" ] },
12+
{ "include": [ "@[\"<].*/core/fwd.hpp[\">]", "private", "<entt/core/type_traits.hpp>", "public" ] },
13+
{ "include": [ "@[\"<].*/entity/fwd.hpp[\">]", "private", "<entt/entity/entity.hpp>", "public" ] },
14+
{ "include": [ "@[\"<].*/entity/fwd.hpp[\">]", "private", "<entt/entity/group.hpp>", "public" ] },
15+
{ "include": [ "@[\"<].*/entity/fwd.hpp[\">]", "private", "<entt/entity/handle.hpp>", "public" ] },
16+
{ "include": [ "@[\"<].*/entity/fwd.hpp[\">]", "private", "<entt/entity/helper.hpp>", "public" ] },
17+
{ "include": [ "@[\"<].*/entity/fwd.hpp[\">]", "private", "<entt/entity/observer.hpp>", "public" ] },
18+
{ "include": [ "@[\"<].*/entity/fwd.hpp[\">]", "private", "<entt/entity/organizer.hpp>", "public" ] },
19+
{ "include": [ "@[\"<].*/entity/fwd.hpp[\">]", "private", "<entt/entity/registry.hpp>", "public" ] },
20+
{ "include": [ "@[\"<].*/entity/fwd.hpp[\">]", "private", "<entt/entity/runtime_view.hpp>", "public" ] },
21+
{ "include": [ "@[\"<].*/entity/fwd.hpp[\">]", "private", "<entt/entity/snapshot.hpp>", "public" ] },
22+
{ "include": [ "@[\"<].*/entity/fwd.hpp[\">]", "private", "<entt/entity/sparse_set.hpp>", "public" ] },
23+
{ "include": [ "@[\"<].*/entity/fwd.hpp[\">]", "private", "<entt/entity/storage.hpp>", "public" ] },
24+
{ "include": [ "@[\"<].*/entity/fwd.hpp[\">]", "private", "<entt/entity/view.hpp>", "public" ] },
25+
{ "include": [ "@[\"<].*/meta/fwd.hpp[\">]", "private", "<entt/meta/meta.hpp>", "public" ] },
26+
{ "include": [ "@[\"<].*/poly/fwd.hpp[\">]", "private", "<entt/poly/poly.hpp>", "public" ] },
27+
{ "include": [ "@[\"<].*/resource/fwd.hpp[\">]", "private", "<entt/resource/cache.hpp>", "public" ] },
28+
{ "include": [ "@[\"<].*/resource/fwd.hpp[\">]", "private", "<entt/resource/loader.hpp>", "public" ] },
29+
{ "include": [ "@[\"<].*/resource/fwd.hpp[\">]", "private", "<entt/resource/resource.hpp>", "public" ] },
30+
{ "include": [ "@[\"<].*/signal/fwd.hpp[\">]", "private", "<entt/signal/delegate.hpp>", "public" ] },
31+
{ "include": [ "@[\"<].*/signal/fwd.hpp[\">]", "private", "<entt/signal/dispatcher.hpp>", "public" ] },
32+
{ "include": [ "@[\"<].*/signal/fwd.hpp[\">]", "private", "<entt/signal/emitter.hpp>", "public" ] },
33+
{ "include": [ "@[\"<].*/signal/fwd.hpp[\">]", "private", "<entt/signal/sigh.hpp>", "public" ] }
434
]

‎src/entt/container/dense_map.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include "../core/iterator.hpp"
1717
#include "../core/memory.hpp"
1818
#include "../core/type_traits.hpp"
19-
#include "fwd.hpp" // IWYU pragma: export
19+
#include "fwd.hpp"
2020

2121
namespace entt {
2222

‎src/entt/container/dense_set.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include "../core/compressed_pair.hpp"
1616
#include "../core/memory.hpp"
1717
#include "../core/type_traits.hpp"
18-
#include "fwd.hpp" // IWYU pragma: export
18+
#include "fwd.hpp"
1919

2020
namespace entt {
2121

‎src/entt/core/any.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include <utility>
88
#include "../config/config.h"
99
#include "../core/utility.hpp"
10-
#include "fwd.hpp" // IWYU pragma: export
10+
#include "fwd.hpp"
1111
#include "type_info.hpp"
1212
#include "type_traits.hpp"
1313

‎src/entt/core/family.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#define ENTT_CORE_FAMILY_HPP
33

44
#include "../config/config.h"
5-
#include "fwd.hpp" // IWYU pragma: export
5+
#include "fwd.hpp"
66

77
namespace entt {
88

‎src/entt/core/hashed_string.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#include <cstddef>
55
#include <cstdint>
6-
#include "fwd.hpp" // IWYU pragma: export
6+
#include "fwd.hpp"
77

88
namespace entt {
99

‎src/entt/core/ident.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include <cstddef>
55
#include <type_traits>
66
#include <utility>
7-
#include "fwd.hpp" // IWYU pragma: export
7+
#include "fwd.hpp"
88
#include "type_traits.hpp"
99

1010
namespace entt {

‎src/entt/core/monostate.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#define ENTT_CORE_MONOSTATE_HPP
33

44
#include "../config/config.h"
5-
#include "fwd.hpp" // IWYU pragma: export
5+
#include "fwd.hpp"
66

77
namespace entt {
88

‎src/entt/core/type_info.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include <utility>
77
#include "../config/config.h"
88
#include "../core/attribute.h"
9-
#include "fwd.hpp" // IWYU pragma: export
9+
#include "fwd.hpp"
1010
#include "hashed_string.hpp"
1111

1212
namespace entt {

‎src/entt/core/type_traits.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include <type_traits>
77
#include <utility>
88
#include "../config/config.h"
9-
#include "fwd.hpp" // IWYU pragma: export
9+
#include "fwd.hpp"
1010

1111
namespace entt {
1212

‎src/entt/entity/entity.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include <cstdint>
66
#include <type_traits>
77
#include "../config/config.h"
8-
#include "fwd.hpp" // IWYU pragma: export
8+
#include "fwd.hpp"
99

1010
namespace entt {
1111

‎src/entt/entity/group.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "../core/type_traits.hpp"
1010
#include "component.hpp"
1111
#include "entity.hpp"
12-
#include "fwd.hpp" // IWYU pragma: export
12+
#include "fwd.hpp"
1313
#include "sparse_set.hpp"
1414
#include "storage.hpp"
1515

‎src/entt/entity/handle.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "../core/iterator.hpp"
99
#include "../core/type_traits.hpp"
1010
#include "entity.hpp"
11-
#include "fwd.hpp" // IWYU pragma: export
11+
#include "fwd.hpp"
1212

1313
namespace entt {
1414

‎src/entt/entity/helper.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include "../core/type_traits.hpp"
88
#include "../signal/delegate.hpp"
99
#include "component.hpp"
10-
#include "fwd.hpp" // IWYU pragma: export
10+
#include "fwd.hpp"
1111
#include "group.hpp"
1212
#include "view.hpp"
1313

‎src/entt/entity/observer.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include <utility>
99
#include "../core/type_traits.hpp"
1010
#include "../signal/delegate.hpp"
11-
#include "fwd.hpp" // IWYU pragma: export
11+
#include "fwd.hpp"
1212
#include "storage.hpp"
1313

1414
namespace entt {

‎src/entt/entity/organizer.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include "../core/utility.hpp"
1111
#include "../graph/adjacency_matrix.hpp"
1212
#include "../graph/flow.hpp"
13-
#include "fwd.hpp" // IWYU pragma: export
13+
#include "fwd.hpp"
1414
#include "helper.hpp"
1515

1616
namespace entt {

‎src/entt/entity/registry.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "../core/utility.hpp"
2121
#include "component.hpp"
2222
#include "entity.hpp"
23-
#include "fwd.hpp" // IWYU pragma: export
23+
#include "fwd.hpp"
2424
#include "group.hpp"
2525
#include "sparse_set.hpp"
2626
#include "storage.hpp"

‎src/entt/entity/runtime_view.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include <utility>
88
#include <vector>
99
#include "entity.hpp"
10-
#include "fwd.hpp" // IWYU pragma: export
10+
#include "fwd.hpp"
1111

1212
namespace entt {
1313

‎src/entt/entity/snapshot.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include "../core/type_traits.hpp"
1414
#include "component.hpp"
1515
#include "entity.hpp"
16-
#include "fwd.hpp" // IWYU pragma: export
16+
#include "fwd.hpp"
1717
#include "view.hpp"
1818

1919
namespace entt {

‎src/entt/entity/sparse_set.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include "../core/memory.hpp"
1414
#include "../core/type_info.hpp"
1515
#include "entity.hpp"
16-
#include "fwd.hpp" // IWYU pragma: export
16+
#include "fwd.hpp"
1717

1818
namespace entt {
1919

‎src/entt/entity/storage.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include "../core/type_info.hpp"
1616
#include "component.hpp"
1717
#include "entity.hpp"
18-
#include "fwd.hpp" // IWYU pragma: export
18+
#include "fwd.hpp"
1919
#include "sigh_storage_mixin.hpp"
2020
#include "sparse_set.hpp"
2121

‎src/entt/entity/view.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include "../core/type_traits.hpp"
1212
#include "component.hpp"
1313
#include "entity.hpp"
14-
#include "fwd.hpp" // IWYU pragma: export
14+
#include "fwd.hpp"
1515
#include "sparse_set.hpp"
1616
#include "storage.hpp"
1717

‎src/entt/meta/meta.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include "../core/utility.hpp"
1616
#include "adl_pointer.hpp"
1717
#include "context.hpp"
18-
#include "fwd.hpp" // IWYU pragma: export
18+
#include "fwd.hpp"
1919
#include "node.hpp"
2020
#include "range.hpp"
2121
#include "type_traits.hpp"

‎src/entt/poly/poly.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "../core/any.hpp"
1010
#include "../core/type_info.hpp"
1111
#include "../core/type_traits.hpp"
12-
#include "fwd.hpp" // IWYU pragma: export
12+
#include "fwd.hpp"
1313

1414
namespace entt {
1515

‎src/entt/resource/cache.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include "../core/fwd.hpp"
1414
#include "../core/iterator.hpp"
1515
#include "../core/utility.hpp"
16-
#include "fwd.hpp" // IWYU pragma: export
16+
#include "fwd.hpp"
1717
#include "loader.hpp"
1818
#include "resource.hpp"
1919

‎src/entt/resource/loader.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#include <memory>
55
#include <utility>
6-
#include "fwd.hpp" // IWYU pragma: export
6+
#include "fwd.hpp"
77

88
namespace entt {
99

‎src/entt/resource/resource.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include <memory>
55
#include <type_traits>
66
#include <utility>
7-
#include "fwd.hpp" // IWYU pragma: export
7+
#include "fwd.hpp"
88

99
namespace entt {
1010

‎src/entt/signal/delegate.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include <utility>
99
#include "../config/config.h"
1010
#include "../core/type_traits.hpp"
11-
#include "fwd.hpp" // IWYU pragma: export
11+
#include "fwd.hpp"
1212

1313
namespace entt {
1414

‎src/entt/signal/dispatcher.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include "../core/fwd.hpp"
1313
#include "../core/type_info.hpp"
1414
#include "../core/utility.hpp"
15-
#include "fwd.hpp" // IWYU pragma: export
15+
#include "fwd.hpp"
1616
#include "sigh.hpp"
1717

1818
namespace entt {

‎src/entt/signal/emitter.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "../core/fwd.hpp"
1010
#include "../core/type_info.hpp"
1111
#include "../core/utility.hpp"
12-
#include "fwd.hpp" // IWYU pragma: export
12+
#include "fwd.hpp"
1313

1414
namespace entt {
1515

‎src/entt/signal/sigh.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include <utility>
88
#include <vector>
99
#include "delegate.hpp"
10-
#include "fwd.hpp" // IWYU pragma: export
10+
#include "fwd.hpp"
1111

1212
namespace entt {
1313

0 commit comments

Comments
 (0)
Please sign in to comment.