Skip to content

Commit 4b6b796

Browse files
JackarainJackarain
committed
Adjust the order of header file inclusions
1 parent 6959a72 commit 4b6b796

14 files changed

Lines changed: 220 additions & 127 deletions

File tree

‎proxy/include/proxy/async_connect.hpp‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,6 @@
1111
#ifndef INCLUDE__2023_10_18__ASYNC_CONNECT_HPP
1212
#define INCLUDE__2023_10_18__ASYNC_CONNECT_HPP
1313

14-
#include <atomic>
15-
#include <iterator>
16-
#include <memory>
17-
#include <tuple>
18-
#include <type_traits>
19-
#include <utility>
20-
#include <vector>
2114

2215
#include <boost/asio/async_result.hpp>
2316
#include <boost/asio/connect.hpp>
@@ -33,6 +26,15 @@
3326

3427
#include <boost/system/error_code.hpp>
3528

29+
#include <atomic>
30+
#include <iterator>
31+
#include <memory>
32+
#include <tuple>
33+
#include <type_traits>
34+
#include <utility>
35+
#include <vector>
36+
37+
3638
namespace asio_util {
3739
namespace net = boost::asio;
3840

‎proxy/include/proxy/fileop.hpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@
99
#define INCLUDE__2023_10_18__FILEOP_HPP
1010

1111

12+
#if __has_include(<boost/filesystem.hpp>)
13+
# define HAS_BOOST_FILESYSTEM
14+
# include <boost/filesystem.hpp>
15+
#endif
16+
1217
#include <cstdint>
1318
#include <fstream>
1419
#include <span>
@@ -18,11 +23,6 @@
1823
#include <type_traits>
1924
#include <filesystem>
2025

21-
#if __has_include(<boost/filesystem.hpp>)
22-
# define HAS_BOOST_FILESYSTEM
23-
# include <boost/filesystem.hpp>
24-
#endif
25-
2626

2727
//////////////////////////////////////////////////////////////////////////
2828

‎proxy/include/proxy/http_proxy_client.hpp‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,8 @@
1212
#define INCLUDE__2023_10_18__HTTP_PROXY_CLIENT_HPP
1313

1414

15-
#include <cstdlib>
16-
#include <string>
17-
#include <memory>
18-
15+
#include "proxy/use_awaitable.hpp"
16+
#include "proxy/strutil.hpp"
1917

2018
#include <boost/system/error_code.hpp>
2119

@@ -41,9 +39,10 @@
4139
# pragma warning(pop)
4240
#endif
4341

42+
#include <cstdlib>
43+
#include <string>
44+
#include <memory>
4445

45-
#include "proxy/use_awaitable.hpp"
46-
#include "proxy/strutil.hpp"
4746

4847
namespace proxy {
4948

‎proxy/include/proxy/ipip.hpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@
88
#ifndef INCLUDE__2019_10_18__FILEOP_HPP
99
#define INCLUDE__2019_10_18__FILEOP_HPP
1010

11+
#include <boost/filesystem.hpp>
12+
#include <boost/asio/ip/address.hpp>
13+
1114
#include <vector>
1215
#include <string>
1316
#include <exception>
1417

15-
#include <boost/filesystem.hpp>
16-
#include <boost/asio/ip/address.hpp>
1718

1819
namespace proxy {
1920
namespace net = boost::asio;

‎proxy/include/proxy/logging.hpp‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,25 +12,6 @@
1212
#define INCLUDE__2016_10_14__LOGGING_HPP
1313

1414

15-
#include <version>
16-
#include <codecvt>
17-
#include <clocale>
18-
#include <fstream>
19-
#include <chrono>
20-
#include <mutex>
21-
#include <memory>
22-
#include <string>
23-
#include <tuple>
24-
#include <thread>
25-
#include <functional>
26-
#include <filesystem>
27-
#include <system_error>
28-
#include <atomic>
29-
#include <deque>
30-
#include <csignal>
31-
#include <condition_variable>
32-
#include <optional>
33-
3415
#ifndef LOGGING_DISABLE_BOOST_ASIO_ENDPOINT
3516
# if defined(__has_include)
3617
# if __has_include(<boost/asio.hpp>)
@@ -167,6 +148,25 @@ namespace std {
167148
# endif
168149
#endif
169150

151+
#include <version>
152+
#include <codecvt>
153+
#include <clocale>
154+
#include <fstream>
155+
#include <chrono>
156+
#include <mutex>
157+
#include <memory>
158+
#include <string>
159+
#include <tuple>
160+
#include <thread>
161+
#include <functional>
162+
#include <filesystem>
163+
#include <system_error>
164+
#include <atomic>
165+
#include <deque>
166+
#include <csignal>
167+
#include <condition_variable>
168+
#include <optional>
169+
170170

171171
//////////////////////////////////////////////////////////////////////////
172172
//

‎proxy/include/proxy/proxy_server.hpp‎

Lines changed: 41 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,29 @@
1212
#define INCLUDE__2023_10_18__PROXY_SERVER_HPP
1313

1414

15-
#include <algorithm>
16-
#include <cstddef>
17-
#include <filesystem>
18-
#include <limits>
19-
#include <memory>
20-
#include <optional>
21-
#include <cstdint>
22-
#include <span>
23-
#include <cstdint>
24-
#include <sstream>
25-
#include <string>
26-
#include <array>
27-
#include <thread>
28-
#include <type_traits>
29-
#include <vector>
30-
#include <tuple>
31-
#include <unordered_map>
32-
#include <unordered_set>
15+
#include "proxy/use_awaitable.hpp"
16+
#include "proxy/async_connect.hpp"
17+
#include "proxy/logging.hpp"
18+
#include "proxy/variant_stream.hpp"
19+
#include "proxy/default_cert.hpp"
20+
#include "proxy/fileop.hpp"
21+
#include "proxy/strutil.hpp"
22+
#include "proxy/ipip.hpp"
23+
24+
#include "proxy/socks_enums.hpp"
25+
#include "proxy/socks_client.hpp"
26+
#include "proxy/http_proxy_client.hpp"
27+
#include "proxy/socks_io.hpp"
28+
29+
#include "proxy/xxhash.hpp"
30+
#include "proxy/scramble.hpp"
31+
32+
#include "proxy/proxy_stream.hpp"
33+
34+
35+
#include <fmt/xchar.h>
36+
#include <fmt/format.h>
37+
3338

3439
#include <boost/asio/io_context.hpp>
3540
#include <boost/asio/co_spawn.hpp>
@@ -91,28 +96,25 @@
9196
# include <boost/filesystem.hpp>
9297
#endif // USE_BOOST_FILESYSTEM
9398

94-
#include <fmt/xchar.h>
95-
#include <fmt/format.h>
96-
97-
98-
#include "proxy/use_awaitable.hpp"
99-
#include "proxy/async_connect.hpp"
100-
#include "proxy/logging.hpp"
101-
#include "proxy/variant_stream.hpp"
102-
#include "proxy/default_cert.hpp"
103-
#include "proxy/fileop.hpp"
104-
#include "proxy/strutil.hpp"
105-
#include "proxy/ipip.hpp"
106-
107-
#include "proxy/socks_enums.hpp"
108-
#include "proxy/socks_client.hpp"
109-
#include "proxy/http_proxy_client.hpp"
110-
#include "proxy/socks_io.hpp"
111-
112-
#include "proxy/xxhash.hpp"
113-
#include "proxy/scramble.hpp"
11499

115-
#include "proxy/proxy_stream.hpp"
100+
#include <algorithm>
101+
#include <cstddef>
102+
#include <filesystem>
103+
#include <limits>
104+
#include <memory>
105+
#include <optional>
106+
#include <cstdint>
107+
#include <span>
108+
#include <cstdint>
109+
#include <sstream>
110+
#include <string>
111+
#include <array>
112+
#include <thread>
113+
#include <type_traits>
114+
#include <vector>
115+
#include <tuple>
116+
#include <unordered_map>
117+
#include <unordered_set>
116118

117119

118120
namespace proxy {

‎proxy/include/proxy/proxy_stream.hpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@
99
#define INCLUDE__2023_11_25__PROXY_SOCKET_HPP
1010

1111

12-
#include <cstdint>
13-
#include <type_traits>
12+
#include "proxy/variant_stream.hpp"
13+
#include "proxy/scramble.hpp"
14+
#include "proxy/tcp_socket.hpp"
1415

1516
#include <boost/asio/ip/tcp.hpp>
1617
#include <boost/asio/ssl/stream.hpp>
1718
#include <boost/asio/buffer.hpp>
1819

19-
#include "proxy/variant_stream.hpp"
20-
#include "proxy/scramble.hpp"
21-
#include "proxy/tcp_socket.hpp"
20+
#include <cstdint>
21+
#include <type_traits>
2222

2323

2424
namespace util {

‎proxy/include/proxy/scramble.hpp‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
#define INCLUDE__2023_11_24__SCRAMBLE_HPP
1313

1414

15+
#include "proxy/xxhash.hpp"
16+
17+
#include <boost/assert.hpp>
18+
1519
#include <random>
1620
#include <cstdint>
1721
#include <sstream>
@@ -20,9 +24,6 @@
2024
#include <span>
2125
#include <limits>
2226

23-
#include <boost/assert.hpp>
24-
25-
#include "proxy/xxhash.hpp"
2627

2728
namespace proxy {
2829

‎proxy/include/proxy/socks_client.hpp‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
#define INCLUDE__2023_10_18__SOCKS_CLIENT_HPP
1313

1414

15-
#include <cstdlib>
16-
#include <string>
17-
#include <memory>
15+
#include "proxy/socks_error_code.hpp"
16+
#include "proxy/socks_enums.hpp"
17+
#include "proxy/socks_io.hpp"
18+
#include "proxy/use_awaitable.hpp"
1819

1920
#include <boost/system/error_code.hpp>
20-
2121
#include <boost/asio/io_context.hpp>
2222
#include <boost/asio/co_spawn.hpp>
2323
#include <boost/asio/detached.hpp>
@@ -27,12 +27,9 @@
2727
#include <boost/asio/read.hpp>
2828
#include <boost/asio/write.hpp>
2929

30-
31-
#include "proxy/socks_error_code.hpp"
32-
#include "proxy/socks_enums.hpp"
33-
#include "proxy/socks_io.hpp"
34-
35-
#include "proxy/use_awaitable.hpp"
30+
#include <cstdlib>
31+
#include <string>
32+
#include <memory>
3633

3734

3835
namespace proxy {

‎proxy/include/proxy/strutil.hpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
#define INCLUDE__2023_10_18__STRUTIL_HPP
1818

1919

20+
#include <boost/date_time/posix_time/posix_time.hpp>
21+
2022
#include <algorithm>
2123
#include <cctype>
2224
#include <cstdlib>
@@ -27,7 +29,6 @@
2729
#include <map>
2830
#include <optional>
2931

30-
#include <boost/date_time/posix_time/posix_time.hpp>
3132

3233
//! The strutil namespace
3334
namespace strutil

0 commit comments

Comments
 (0)