Skip to content

Commit d43941f

Browse files
SaschaWillemsSaschaWillems
committed
Re-Enable include sorting
Explicitly exclude some Android specific includes from ordering
1 parent 422468f commit d43941f

38 files changed

+279
-275
lines changed

‎attachments/.clang-format‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ PenaltyBreakString: 1000
8585
PenaltyExcessCharacter: 1000000
8686
PenaltyReturnTypeOnItsOwnLine: 60
8787
PointerAlignment: Right
88-
ReflowComments: true
89-
SortIncludes: false
88+
ReflowComments: true
89+
SortIncludes: true
9090
SortUsingDeclarations: true
9191
SpaceAfterCStyleCast: true
9292
SpaceAfterTemplateKeyword: true

‎attachments/00_base_code.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import vulkan_hpp;
66
#endif
77
#include <GLFW/glfw3.h>
88

9+
#include <cstdlib>
910
#include <iostream>
1011
#include <stdexcept>
11-
#include <cstdlib>
1212

1313
const uint32_t WIDTH = 800;
1414
const uint32_t HEIGHT = 600;

‎attachments/01_instance_creation.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#include <algorithm>
2-
#include <iostream>
3-
#include <stdexcept>
42
#include <cstdlib>
3+
#include <iostream>
54
#include <memory>
5+
#include <stdexcept>
66

77
#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
88
# include <vulkan/vulkan_raii.hpp>

‎attachments/02_validation_layers.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1+
#include <algorithm>
2+
#include <cstdlib>
3+
#include <cstring>
14
#include <iostream>
5+
#include <memory>
26
#include <stdexcept>
37
#include <vector>
4-
#include <cstring>
5-
#include <cstdlib>
6-
#include <memory>
7-
#include <algorithm>
88

99
#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
1010
# include <vulkan/vulkan_raii.hpp>

‎attachments/03_physical_device_selection.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1+
#include <algorithm>
2+
#include <cstdlib>
3+
#include <cstring>
14
#include <iostream>
5+
#include <memory>
26
#include <stdexcept>
37
#include <vector>
4-
#include <cstring>
5-
#include <cstdlib>
6-
#include <memory>
7-
#include <algorithm>
88

99
#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
1010
# include <vulkan/vulkan_raii.hpp>

‎attachments/04_logical_device.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1+
#include <algorithm>
12
#include <assert.h>
3+
#include <cstdlib>
4+
#include <cstring>
25
#include <iostream>
6+
#include <memory>
37
#include <stdexcept>
48
#include <vector>
5-
#include <cstring>
6-
#include <cstdlib>
7-
#include <memory>
8-
#include <algorithm>
99

1010
#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
1111
# include <vulkan/vulkan_raii.hpp>

‎attachments/05_window_surface.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1+
#include <algorithm>
2+
#include <cstdlib>
3+
#include <cstring>
14
#include <iostream>
5+
#include <memory>
26
#include <stdexcept>
37
#include <vector>
4-
#include <cstring>
5-
#include <cstdlib>
6-
#include <memory>
7-
#include <algorithm>
88

99
#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
1010
# include <vulkan/vulkan_raii.hpp>

‎attachments/06_swap_chain_creation.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1+
#include <algorithm>
12
#include <assert.h>
3+
#include <cstdlib>
4+
#include <cstring>
25
#include <iostream>
6+
#include <limits>
7+
#include <memory>
38
#include <stdexcept>
49
#include <vector>
5-
#include <cstring>
6-
#include <cstdlib>
7-
#include <memory>
8-
#include <algorithm>
9-
#include <limits>
1010

1111
#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
1212
# include <vulkan/vulkan_raii.hpp>

‎attachments/07_image_views.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1+
#include <algorithm>
2+
#include <assert.h>
3+
#include <cstdlib>
4+
#include <cstring>
15
#include <iostream>
6+
#include <limits>
7+
#include <memory>
28
#include <stdexcept>
39
#include <vector>
4-
#include <cstring>
5-
#include <cstdlib>
6-
#include <memory>
7-
#include <algorithm>
8-
#include <limits>
9-
#include <assert.h>
1010

1111
#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
1212
# include <vulkan/vulkan_raii.hpp>

‎attachments/08_graphics_pipeline.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1+
#include <algorithm>
2+
#include <assert.h>
3+
#include <cstdlib>
4+
#include <cstring>
15
#include <iostream>
6+
#include <limits>
7+
#include <memory>
28
#include <stdexcept>
39
#include <vector>
4-
#include <cstring>
5-
#include <cstdlib>
6-
#include <memory>
7-
#include <algorithm>
8-
#include <limits>
9-
#include <assert.h>
1010

1111
#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
1212
# include <vulkan/vulkan_raii.hpp>

0 commit comments

Comments
 (0)