Skip to content

Commit b8da1c5

Browse files
trflynn89trflynn89
committed
Move fly/traits to fly/concepts
Now that the traits header is removed, it makes more sense this way.
1 parent e45f1e7 commit b8da1c5

26 files changed

+35
-35
lines changed

‎build/win/libfly/libfly.vcxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@
172172
<ClInclude Include="..\..\..\fly\coders\huffman\huffman_decoder.hpp" />
173173
<ClInclude Include="..\..\..\fly\coders\huffman\huffman_encoder.hpp" />
174174
<ClInclude Include="..\..\..\fly\coders\huffman\huffman_types.hpp" />
175+
<ClInclude Include="..\..\..\fly\concepts\concepts.hpp" />
175176
<ClInclude Include="..\..\..\fly\config\config.hpp" />
176177
<ClInclude Include="..\..\..\fly\config\config_manager.hpp" />
177178
<ClInclude Include="..\..\..\fly\logger\detail\console_sink.hpp" />
@@ -210,7 +211,6 @@
210211
<ClInclude Include="..\..\..\fly\task\task_manager.hpp" />
211212
<ClInclude Include="..\..\..\fly\task\task_runner.hpp" />
212213
<ClInclude Include="..\..\..\fly\task\task_types.hpp" />
213-
<ClInclude Include="..\..\..\fly\traits\concepts.hpp" />
214214
<ClInclude Include="..\..\..\fly\types\bit_stream\bit_stream_reader.hpp" />
215215
<ClInclude Include="..\..\..\fly\types\bit_stream\bit_stream_types.hpp" />
216216
<ClInclude Include="..\..\..\fly\types\bit_stream\bit_stream_writer.hpp" />

‎build/win/libfly/libfly.vcxproj.filters

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
<Filter Include="coders\huffman">
1111
<UniqueIdentifier>{c8372ac9-d455-4467-9414-627cb49690f0}</UniqueIdentifier>
1212
</Filter>
13+
<Filter Include="concepts">
14+
<UniqueIdentifier>{f5cf0d32-8583-4428-9fd7-a6c9852235c2}</UniqueIdentifier>
15+
</Filter>
1316
<Filter Include="config">
1417
<UniqueIdentifier>{7bfc9b93-2ef1-48fd-9eb8-ccb630757af9}</UniqueIdentifier>
1518
</Filter>
@@ -52,9 +55,6 @@
5255
<Filter Include="task">
5356
<UniqueIdentifier>{b3dd9d0d-ca98-41db-a85b-5754423eb2eb}</UniqueIdentifier>
5457
</Filter>
55-
<Filter Include="traits">
56-
<UniqueIdentifier>{f5cf0d32-8583-4428-9fd7-a6c9852235c2}</UniqueIdentifier>
57-
</Filter>
5858
<Filter Include="types">
5959
<UniqueIdentifier>{2fe9b6ce-cbdc-485c-bd1c-37fe9ef648d9}</UniqueIdentifier>
6060
</Filter>
@@ -109,6 +109,9 @@
109109
<ClInclude Include="..\..\..\fly\coders\huffman\huffman_types.hpp">
110110
<Filter>coders\huffman</Filter>
111111
</ClInclude>
112+
<ClInclude Include="..\..\..\fly\concepts\concepts.hpp">
113+
<Filter>concepts</Filter>
114+
</ClInclude>
112115
<ClInclude Include="..\..\..\fly\config\config.hpp">
113116
<Filter>config</Filter>
114117
</ClInclude>
@@ -223,9 +226,6 @@
223226
<ClInclude Include="..\..\..\fly\task\task_types.hpp">
224227
<Filter>task</Filter>
225228
</ClInclude>
226-
<ClInclude Include="..\..\..\fly\traits\concepts.hpp">
227-
<Filter>concepts</Filter>
228-
</ClInclude>
229229
<ClInclude Include="..\..\..\fly\types\bit_stream\bit_stream_reader.hpp">
230230
<Filter>types\bit_stream</Filter>
231231
</ClInclude>

‎build/win/libfly_unit_tests/libfly_unit_tests.vcxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,7 @@
221221
<ClCompile Include="..\..\..\test\main.cpp" />
222222
<ClCompile Include="..\..\..\test\coders\base64_coder.cpp" />
223223
<ClCompile Include="..\..\..\test\coders\huffman_coder.cpp" />
224+
<ClCompile Include="..\..\..\test\concepts\concepts.cpp" />
224225
<ClCompile Include="..\..\..\test\config\config.cpp" />
225226
<ClCompile Include="..\..\..\test\config\config_manager.cpp" />
226227
<ClCompile Include="..\..\..\test\logger\console_logger.cpp" />
@@ -241,7 +242,6 @@
241242
<ClCompile Include="..\..\..\test\system\system.cpp" />
242243
<ClCompile Include="..\..\..\test\system\system_monitor.cpp" />
243244
<ClCompile Include="..\..\..\test\task\task.cpp" />
244-
<ClCompile Include="..\..\..\test\traits\concepts.cpp" />
245245
<ClCompile Include="..\..\..\test\types\bit_stream\bit_stream.cpp" />
246246
<ClCompile Include="..\..\..\test\types\concurrency\concurrent_container.cpp" />
247247
<ClCompile Include="..\..\..\test\types\json\json.cpp" />

‎build/win/libfly_unit_tests/libfly_unit_tests.vcxproj.filters

+6-6
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
<Filter Include="config">
88
<UniqueIdentifier>{ee0c6b14-fa2b-4f87-a3b0-ccbf7c4c13c4}</UniqueIdentifier>
99
</Filter>
10+
<Filter Include="concepts">
11+
<UniqueIdentifier>{1716af47-ff79-4f7f-b910-fefa3c97bfe0}</UniqueIdentifier>
12+
</Filter>
1013
<Filter Include="logger">
1114
<UniqueIdentifier>{7ecf1fbd-e9f8-430f-aa13-4ddb9e46dbd8}</UniqueIdentifier>
1215
</Filter>
@@ -25,9 +28,6 @@
2528
<Filter Include="task">
2629
<UniqueIdentifier>{efd06495-eee3-4270-a39c-2d065f559bc6}</UniqueIdentifier>
2730
</Filter>
28-
<Filter Include="traits">
29-
<UniqueIdentifier>{1716af47-ff79-4f7f-b910-fefa3c97bfe0}</UniqueIdentifier>
30-
</Filter>
3131
<Filter Include="types">
3232
<UniqueIdentifier>{3120a3ba-5fe5-417c-9e5f-33d9537560d1}</UniqueIdentifier>
3333
</Filter>
@@ -56,6 +56,9 @@
5656
<ClCompile Include="..\..\..\test\coders\huffman_coder.cpp">
5757
<Filter>coders</Filter>
5858
</ClCompile>
59+
<ClCompile Include="..\..\..\test\concepts\concepts.cpp">
60+
<Filter>concepts</Filter>
61+
</ClCompile>
5962
<ClCompile Include="..\..\..\test\config\config.cpp">
6063
<Filter>config</Filter>
6164
</ClCompile>
@@ -116,9 +119,6 @@
116119
<ClCompile Include="..\..\..\test\task\task.cpp">
117120
<Filter>task</Filter>
118121
</ClCompile>
119-
<ClCompile Include="..\..\..\test\traits\concepts.cpp">
120-
<Filter>concepts</Filter>
121-
</ClCompile>
122122
<ClCompile Include="..\..\..\test\types\bit_stream\bit_stream.cpp">
123123
<Filter>types\bit_stream</Filter>
124124
</ClCompile>

‎fly/traits/concepts.hpp ‎fly/concepts/concepts.hpp

File renamed without changes.

‎fly/logger/styler.hpp

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

3+
#include "fly/concepts/concepts.hpp"
34
#include "fly/fly.hpp"
45
#include "fly/logger/detail/styler_proxy.hpp"
5-
#include "fly/traits/concepts.hpp"
66
#include "fly/types/numeric/literals.hpp"
77

88
#include <cstdint>

‎fly/net/socket/socket_concepts.hpp

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

3-
#include "fly/traits/concepts.hpp"
3+
#include "fly/concepts/concepts.hpp"
44

55
namespace fly::net {
66

‎fly/types/bit_stream/detail/bit_stream_concepts.hpp

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

3-
#include "fly/traits/concepts.hpp"
3+
#include "fly/concepts/concepts.hpp"
44
#include "fly/types/bit_stream/bit_stream_types.hpp"
55

66
namespace fly::detail {

‎fly/types/json/detail/json_iterator.hpp

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

3-
#include "fly/traits/concepts.hpp"
3+
#include "fly/concepts/concepts.hpp"
44
#include "fly/types/json/json_concepts.hpp"
55
#include "fly/types/json/json_exception.hpp"
66
#include "fly/types/string/string.hpp"

‎fly/types/json/json.hpp

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

3-
#include "fly/traits/concepts.hpp"
3+
#include "fly/concepts/concepts.hpp"
44
#include "fly/types/json/detail/array_util.hpp"
55
#include "fly/types/json/detail/json_iterator.hpp"
66
#include "fly/types/json/detail/json_reverse_iterator.hpp"

‎fly/types/json/json_concepts.hpp

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

3-
#include "fly/traits/concepts.hpp"
3+
#include "fly/concepts/concepts.hpp"
44
#include "fly/types/json/json_types.hpp"
55
#include "fly/types/string/detail/string_concepts.hpp"
66

‎fly/types/numeric/detail/endian_concepts.hpp

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

3-
#include "fly/traits/concepts.hpp"
3+
#include "fly/concepts/concepts.hpp"
44

55
namespace fly::detail {
66

‎fly/types/numeric/endian.hpp

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

3+
#include "fly/concepts/concepts.hpp"
34
#include "fly/fly.hpp"
4-
#include "fly/traits/concepts.hpp"
55
#include "fly/types/numeric/detail/endian_concepts.hpp"
66

77
#include <bit>

‎fly/types/string/detail/format_parameters.hpp

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

3-
#include "fly/traits/concepts.hpp"
3+
#include "fly/concepts/concepts.hpp"
44
#include "fly/types/string/detail/classifier.hpp"
55
#include "fly/types/string/detail/format_parse_context.hpp"
66
#include "fly/types/string/detail/format_specifier.hpp"

‎fly/types/string/detail/format_specifier.hpp

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

3-
#include "fly/traits/concepts.hpp"
3+
#include "fly/concepts/concepts.hpp"
44
#include "fly/types/string/detail/classifier.hpp"
55
#include "fly/types/string/detail/format_parameter_type.hpp"
66
#include "fly/types/string/detail/format_parse_context.hpp"

‎fly/types/string/detail/string_concepts.hpp

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

3-
#include "fly/traits/concepts.hpp"
3+
#include "fly/concepts/concepts.hpp"
44

55
#include <string>
66
#include <type_traits>

‎fly/types/string/detail/unicode.hpp

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

3-
#include "fly/traits/concepts.hpp"
3+
#include "fly/concepts/concepts.hpp"
44
#include "fly/types/string/detail/string_traits.hpp"
55
#include "fly/types/string/literals.hpp"
66

‎fly/types/string/formatters.hpp

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

3+
#include "fly/concepts/concepts.hpp"
34
#include "fly/fly.hpp"
4-
#include "fly/traits/concepts.hpp"
55
#include "fly/types/string/detail/classifier.hpp"
66
#include "fly/types/string/detail/format_specifier.hpp"
77
#include "fly/types/string/detail/stream_util.hpp"

‎fly/types/string/string.hpp

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

3-
#include "fly/traits/concepts.hpp"
3+
#include "fly/concepts/concepts.hpp"
44
#include "fly/types/string/detail/classifier.hpp"
55
#include "fly/types/string/detail/converter.hpp"
66
#include "fly/types/string/detail/format_context.hpp"

‎test/traits/concepts.cpp ‎test/concepts/concepts.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "fly/traits/concepts.hpp"
1+
#include "fly/concepts/concepts.hpp"
22

33
#include "catch2/catch_test_macros.hpp"
44

‎test/logger/styler.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
#include "test/util/capture_stream.hpp"
44

5+
#include "fly/concepts/concepts.hpp"
56
#include "fly/fly.hpp"
6-
#include "fly/traits/concepts.hpp"
77
#include "fly/types/string/string.hpp"
88

99
#include "catch2/catch_test_macros.hpp"

‎test/types/json/json_accessors.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "test/types/json/json_helpers.hpp"
22

3-
#include "fly/traits/concepts.hpp"
3+
#include "fly/concepts/concepts.hpp"
44
#include "fly/types/json/json.hpp"
55

66
#include "catch2/catch_test_macros.hpp"

‎test/types/json/json_helpers.hpp

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

3-
#include "fly/traits/concepts.hpp"
3+
#include "fly/concepts/concepts.hpp"
44
#include "fly/types/json/json.hpp"
55
#include "fly/types/json/json_exception.hpp"
66
#include "fly/types/string/string.hpp"

‎test/types/numeric/endian.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "fly/types/numeric/endian.hpp"
22

3-
#include "fly/traits/concepts.hpp"
3+
#include "fly/concepts/concepts.hpp"
44

55
#include "catch2/catch_template_test_macros.hpp"
66
#include "catch2/catch_test_macros.hpp"

‎test/types/string/converter.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "fly/traits/concepts.hpp"
1+
#include "fly/concepts/concepts.hpp"
22
#include "fly/types/numeric/literals.hpp"
33
#include "fly/types/string/string.hpp"
44

‎test/types/string/string_concepts.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "fly/types/string/detail/string_concepts.hpp"
22

3-
#include "fly/traits/concepts.hpp"
3+
#include "fly/concepts/concepts.hpp"
44
#include "fly/types/string/detail/string_traits.hpp"
55

66
#include "catch2/catch_template_test_macros.hpp"

0 commit comments

Comments
 (0)