Skip to content

Commit 575bb4a

Browse files
committed
Rename socket_concepts.hpp and socket_types.hpp to exclude "socket"
What these headers are concepts and types for are implied by where they reside.
1 parent 9e2dc13 commit 575bb4a

15 files changed

+24
-24
lines changed

build/win/libfly/libfly.vcxproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -192,11 +192,11 @@
192192
<ClInclude Include="..\..\..\fly\net\network_config.hpp" />
193193
<ClInclude Include="..\..\..\fly\net\socket\detail\base_socket.hpp" />
194194
<ClInclude Include="..\..\..\fly\net\socket\detail\socket_operations.hpp" />
195+
<ClInclude Include="..\..\..\fly\net\socket\concepts.hpp" />
195196
<ClInclude Include="..\..\..\fly\net\socket\listen_socket.hpp" />
196-
<ClInclude Include="..\..\..\fly\net\socket\socket_concepts.hpp" />
197197
<ClInclude Include="..\..\..\fly\net\socket\socket_service.hpp" />
198-
<ClInclude Include="..\..\..\fly\net\socket\socket_types.hpp" />
199198
<ClInclude Include="..\..\..\fly\net\socket\tcp_socket.hpp" />
199+
<ClInclude Include="..\..\..\fly\net\socket\types.hpp" />
200200
<ClInclude Include="..\..\..\fly\net\socket\udp_socket.hpp" />
201201
<ClInclude Include="..\..\..\fly\parser\ini_parser.hpp" />
202202
<ClInclude Include="..\..\..\fly\parser\json_parser.hpp" />

build/win/libfly/libfly.vcxproj.filters

+4-4
Original file line numberDiff line numberDiff line change
@@ -163,19 +163,19 @@
163163
<ClInclude Include="..\..\..\fly\net\network_config.hpp">
164164
<Filter>net</Filter>
165165
</ClInclude>
166-
<ClInclude Include="..\..\..\fly\net\socket\listen_socket.hpp">
166+
<ClInclude Include="..\..\..\fly\net\socket\concepts.hpp">
167167
<Filter>net\socket</Filter>
168168
</ClInclude>
169-
<ClInclude Include="..\..\..\fly\net\socket\socket_concepts.hpp">
169+
<ClInclude Include="..\..\..\fly\net\socket\listen_socket.hpp">
170170
<Filter>net\socket</Filter>
171171
</ClInclude>
172172
<ClInclude Include="..\..\..\fly\net\socket\socket_service.hpp">
173173
<Filter>net\socket</Filter>
174174
</ClInclude>
175-
<ClInclude Include="..\..\..\fly\net\socket\socket_types.hpp">
175+
<ClInclude Include="..\..\..\fly\net\socket\tcp_socket.hpp">
176176
<Filter>net\socket</Filter>
177177
</ClInclude>
178-
<ClInclude Include="..\..\..\fly\net\socket\tcp_socket.hpp">
178+
<ClInclude Include="..\..\..\fly\net\socket\types.hpp">
179179
<Filter>net\socket</Filter>
180180
</ClInclude>
181181
<ClInclude Include="..\..\..\fly\net\socket\udp_socket.hpp">

fly/net/endpoint.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
#include "fly/fly.hpp"
44
#include "fly/net/ipv4_address.hpp"
55
#include "fly/net/ipv6_address.hpp"
6-
#include "fly/net/socket/socket_concepts.hpp"
7-
#include "fly/net/socket/socket_types.hpp"
6+
#include "fly/net/socket/concepts.hpp"
7+
#include "fly/net/socket/types.hpp"
88
#include "fly/types/string/lexer.hpp"
99
#include "fly/types/string/string.hpp"
1010

File renamed without changes.

fly/net/socket/detail/base_socket.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22

3-
#include "fly/net/socket/socket_concepts.hpp"
4-
#include "fly/net/socket/socket_types.hpp"
3+
#include "fly/net/socket/concepts.hpp"
4+
#include "fly/net/socket/types.hpp"
55

66
#include <cstdint>
77
#include <memory>

fly/net/socket/detail/socket_operations.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22

3-
#include "fly/net/socket/socket_concepts.hpp"
4-
#include "fly/net/socket/socket_types.hpp"
3+
#include "fly/net/socket/concepts.hpp"
4+
#include "fly/net/socket/types.hpp"
55

66
#include <chrono>
77
#include <cstddef>

fly/net/socket/listen_socket.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22

3+
#include "fly/net/socket/concepts.hpp"
34
#include "fly/net/socket/detail/base_socket.hpp"
4-
#include "fly/net/socket/socket_concepts.hpp"
55

66
#include <functional>
77
#include <memory>

fly/net/socket/socket_service.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22

3-
#include "fly/net/socket/socket_concepts.hpp"
4-
#include "fly/net/socket/socket_types.hpp"
3+
#include "fly/net/socket/concepts.hpp"
4+
#include "fly/net/socket/types.hpp"
55

66
#include <functional>
77
#include <memory>

fly/net/socket/tcp_socket.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#pragma once
22

3+
#include "fly/net/socket/concepts.hpp"
34
#include "fly/net/socket/detail/base_socket.hpp"
4-
#include "fly/net/socket/socket_concepts.hpp"
5-
#include "fly/net/socket/socket_types.hpp"
5+
#include "fly/net/socket/types.hpp"
66

77
#include <cstddef>
88
#include <functional>
File renamed without changes.

fly/net/socket/udp_socket.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#pragma once
22

3+
#include "fly/net/socket/concepts.hpp"
34
#include "fly/net/socket/detail/base_socket.hpp"
4-
#include "fly/net/socket/socket_concepts.hpp"
5-
#include "fly/net/socket/socket_types.hpp"
5+
#include "fly/net/socket/types.hpp"
66

77
#include <cstddef>
88
#include <functional>

test/net/listen_socket.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
#include "fly/net/ipv6_address.hpp"
1010
#include "fly/net/network_config.hpp"
1111
#include "fly/net/socket/socket_service.hpp"
12-
#include "fly/net/socket/socket_types.hpp"
1312
#include "fly/net/socket/tcp_socket.hpp"
13+
#include "fly/net/socket/types.hpp"
1414
#include "fly/task/task_manager.hpp"
1515
#include "fly/task/task_runner.hpp"
1616

test/net/socket_util.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
#include "fly/fly.hpp"
44
#include "fly/net/network_config.hpp"
5+
#include "fly/net/socket/concepts.hpp"
56
#include "fly/net/socket/detail/socket_operations.hpp"
6-
#include "fly/net/socket/socket_concepts.hpp"
7-
#include "fly/net/socket/socket_types.hpp"
7+
#include "fly/net/socket/types.hpp"
88
#include "fly/types/concurrency/concurrent_queue.hpp"
99

1010
#include "catch2/catch_test_macros.hpp"

test/net/tcp_socket.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include "fly/net/network_config.hpp"
1111
#include "fly/net/socket/listen_socket.hpp"
1212
#include "fly/net/socket/socket_service.hpp"
13-
#include "fly/net/socket/socket_types.hpp"
13+
#include "fly/net/socket/types.hpp"
1414
#include "fly/task/task_manager.hpp"
1515
#include "fly/task/task_runner.hpp"
1616
#include "fly/types/string/string.hpp"

test/net/udp_socket.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "fly/net/ipv6_address.hpp"
1010
#include "fly/net/network_config.hpp"
1111
#include "fly/net/socket/socket_service.hpp"
12-
#include "fly/net/socket/socket_types.hpp"
12+
#include "fly/net/socket/types.hpp"
1313
#include "fly/task/task_manager.hpp"
1414
#include "fly/task/task_runner.hpp"
1515
#include "fly/types/string/string.hpp"

0 commit comments

Comments
 (0)