Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitb1bb251

Browse files
committed
Updated Toolchain::Id to ToolchainId
1 parent0e44a14 commitb1bb251

21 files changed

+67
-69
lines changed

‎buildcc/lib/args/src/args.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ const std::unordered_map<const char *, buildcc::env::LogLevel> kLogLevelMap{
7575
{"critical", buildcc::env::LogLevel::Critical},
7676
};
7777

78-
const std::unordered_map<constchar *, buildcc::Toolchain::Id>kToolchainIdMap{
78+
const std::unordered_map<constchar *, buildcc::ToolchainId>kToolchainIdMap{
7979
{"gcc", buildcc::ToolchainId::Gcc},
8080
{"msvc", buildcc::ToolchainId::Msvc},
8181
{"mingw", buildcc::ToolchainId::MinGW},

‎buildcc/lib/args/test/test_args.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ TEST(ArgsTestGroup, Args_CustomToolchain) {
6666
// Toolchain
6767
CHECK_TRUE(gcc_toolchain.state.build);
6868
CHECK_FALSE(gcc_toolchain.state.test);
69-
CHECK(gcc_toolchain.id == buildcc::Toolchain::Id::Gcc);
69+
CHECK(gcc_toolchain.id == buildcc::ToolchainId::Gcc);
7070
STRCMP_EQUAL(gcc_toolchain.name.c_str(),"gcc");
7171
STRCMP_EQUAL(gcc_toolchain.binaries.assembler.c_str(),"as");
7272
STRCMP_EQUAL(gcc_toolchain.binaries.c_compiler.c_str(),"gcc");
@@ -104,7 +104,7 @@ TEST(ArgsTestGroup, Args_MultipleCustomToolchain) {
104104
// GCC
105105
CHECK_TRUE(gcc_toolchain.state.build);
106106
CHECK_FALSE(gcc_toolchain.state.test);
107-
CHECK(gcc_toolchain.id == buildcc::Toolchain::Id::Gcc);
107+
CHECK(gcc_toolchain.id == buildcc::ToolchainId::Gcc);
108108
STRCMP_EQUAL(gcc_toolchain.name.c_str(),"gcc");
109109
STRCMP_EQUAL(gcc_toolchain.binaries.assembler.c_str(),"as");
110110
STRCMP_EQUAL(gcc_toolchain.binaries.c_compiler.c_str(),"gcc");
@@ -115,7 +115,7 @@ TEST(ArgsTestGroup, Args_MultipleCustomToolchain) {
115115
// MSVC
116116
CHECK_TRUE(msvc_toolchain.state.build);
117117
CHECK_TRUE(msvc_toolchain.state.test);
118-
CHECK(msvc_toolchain.id == buildcc::Toolchain::Id::Msvc);
118+
CHECK(msvc_toolchain.id == buildcc::ToolchainId::Msvc);
119119
STRCMP_EQUAL(msvc_toolchain.name.c_str(),"msvc");
120120
STRCMP_EQUAL(msvc_toolchain.binaries.assembler.c_str(),"cl");
121121
STRCMP_EQUAL(msvc_toolchain.binaries.c_compiler.c_str(),"cl");
@@ -165,7 +165,7 @@ TEST(ArgsTestGroup, Args_CustomTarget) {
165165
// Toolchain
166166
CHECK_TRUE(gcc_toolchain.state.build);
167167
CHECK_FALSE(gcc_toolchain.state.test);
168-
CHECK(gcc_toolchain.id == buildcc::Toolchain::Id::Gcc);
168+
CHECK(gcc_toolchain.id == buildcc::ToolchainId::Gcc);
169169
STRCMP_EQUAL(gcc_toolchain.name.c_str(),"gcc");
170170
STRCMP_EQUAL(gcc_toolchain.binaries.assembler.c_str(),"as");
171171
STRCMP_EQUAL(gcc_toolchain.binaries.c_compiler.c_str(),"gcc");
@@ -219,7 +219,7 @@ TEST(ArgsTestGroup, Args_MultipleCustomTarget) {
219219
// Toolchain
220220
CHECK_TRUE(gcc_toolchain.state.build);
221221
CHECK_FALSE(gcc_toolchain.state.test);
222-
CHECK(gcc_toolchain.id == buildcc::Toolchain::Id::Gcc);
222+
CHECK(gcc_toolchain.id == buildcc::ToolchainId::Gcc);
223223
STRCMP_EQUAL(gcc_toolchain.name.c_str(),"gcc");
224224
STRCMP_EQUAL(gcc_toolchain.binaries.assembler.c_str(),"as");
225225
STRCMP_EQUAL(gcc_toolchain.binaries.c_compiler.c_str(),"gcc");
@@ -240,7 +240,7 @@ TEST(ArgsTestGroup, Args_MultipleCustomTarget) {
240240
// Toolchain
241241
CHECK_TRUE(msvc_toolchain.state.build);
242242
CHECK_TRUE(msvc_toolchain.state.test);
243-
CHECK(msvc_toolchain.id == buildcc::Toolchain::Id::Msvc);
243+
CHECK(msvc_toolchain.id == buildcc::ToolchainId::Msvc);
244244
STRCMP_EQUAL(msvc_toolchain.name.c_str(),"msvc");
245245
STRCMP_EQUAL(msvc_toolchain.binaries.assembler.c_str(),"cl");
246246
STRCMP_EQUAL(msvc_toolchain.binaries.c_compiler.c_str(),"cl");

‎buildcc/lib/args/test/test_register.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ TEST(RegisterTestGroup, Register_Build) {
100100

101101
// Make dummy toolchain and target
102102
buildcc::env::init(fs::current_path(),fs::current_path());
103-
buildcc::Toolchaintoolchain(buildcc::Toolchain::Id::Gcc,"","","","","",
103+
buildcc::Toolchaintoolchain(buildcc::ToolchainId::Gcc,"","","","","",
104104
"");
105105
buildcc::BaseTargettarget("dummyT", buildcc::TargetType::Executable,
106106
toolchain,"");
@@ -148,7 +148,7 @@ TEST(RegisterTestGroup, Register_NoBuildAndDep) {
148148

149149
// Make dummy toolchain and target
150150
buildcc::env::init(fs::current_path(),fs::current_path());
151-
buildcc::Toolchaintoolchain(buildcc::Toolchain::Id::Gcc,"","","","","",
151+
buildcc::Toolchaintoolchain(buildcc::ToolchainId::Gcc,"","","","","",
152152
"");
153153
buildcc::BaseTargettarget("dummyT", buildcc::TargetType::Executable,
154154
toolchain,"");
@@ -232,7 +232,7 @@ TEST(RegisterTestGroup, Register_BuildAndDep) {
232232

233233
// Make dummy toolchain and target
234234
buildcc::env::init(fs::current_path(),fs::current_path());
235-
buildcc::Toolchaintoolchain(buildcc::Toolchain::Id::Gcc,"","","","","",
235+
buildcc::Toolchaintoolchain(buildcc::ToolchainId::Gcc,"","","","","",
236236
"");
237237
buildcc::BaseTargettarget("dummyT", buildcc::TargetType::Executable,
238238
toolchain,"");
@@ -327,7 +327,7 @@ TEST(RegisterTestGroup, Register_DepDuplicate) {
327327

328328
// Make dummy toolchain and target
329329
buildcc::env::init(fs::current_path(),fs::current_path());
330-
buildcc::Toolchaintoolchain(buildcc::Toolchain::Id::Gcc,"","","","","",
330+
buildcc::Toolchaintoolchain(buildcc::ToolchainId::Gcc,"","","","","",
331331
"");
332332
buildcc::BaseTargettarget("dummyT", buildcc::TargetType::Executable,
333333
toolchain,"");
@@ -403,7 +403,7 @@ TEST(RegisterTestGroup, Register_DepCyclic) {
403403

404404
// Make dummy toolchain and target
405405
buildcc::env::init(fs::current_path(),fs::current_path());
406-
buildcc::Toolchaintoolchain(buildcc::Toolchain::Id::Gcc,"","","","","",
406+
buildcc::Toolchaintoolchain(buildcc::ToolchainId::Gcc,"","","","","",
407407
"");
408408
buildcc::BaseTargettarget("dummyT", buildcc::TargetType::Executable,
409409
toolchain,"");
@@ -479,7 +479,7 @@ TEST(RegisterTestGroup, Register_Test) {
479479

480480
// Make dummy toolchain and target
481481
buildcc::env::init(fs::current_path(),fs::current_path());
482-
buildcc::Toolchaintoolchain(buildcc::Toolchain::Id::Gcc,"","","","","",
482+
buildcc::Toolchaintoolchain(buildcc::ToolchainId::Gcc,"","","","","",
483483
"");
484484
buildcc::BaseTargettarget("dummyT", buildcc::TargetType::Executable,
485485
toolchain,"");
@@ -564,7 +564,7 @@ TEST(RegisterTestGroup, Register_TestWithOutput) {
564564

565565
// Make dummy toolchain and target
566566
buildcc::env::init(fs::current_path(),fs::current_path());
567-
buildcc::Toolchaintoolchain(buildcc::Toolchain::Id::Gcc,"","","","","",
567+
buildcc::Toolchaintoolchain(buildcc::ToolchainId::Gcc,"","","","","",
568568
"");
569569
buildcc::BaseTargettarget("dummyT", buildcc::TargetType::Executable,
570570
toolchain,"");

‎buildcc/lib/target/test/target/test_base_target.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ TEST_GROUP(TargetBaseTestGroup)
2121
}
2222
};
2323
// clang-format on
24-
static buildcc::Toolchaingcc(buildcc::Toolchain::Id::Gcc,"gcc","as","gcc",
24+
static buildcc::Toolchaingcc(buildcc::ToolchainId::Gcc,"gcc","as","gcc",
2525
"g++","ar","ld");
2626

2727
TEST(TargetBaseTestGroup, InvalidTargetType) {

‎buildcc/lib/target/test/target/test_compile_object.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ TEST_GROUP(TargetCompileObjectTestGroup)
1515
};
1616
// clang-format on
1717

18-
static buildcc::Toolchaingcc(buildcc::Toolchain::Id::Gcc,"gcc","as","gcc",
18+
static buildcc::Toolchaingcc(buildcc::ToolchainId::Gcc,"gcc","as","gcc",
1919
"g++","ar","ld");
2020

2121
TEST(TargetCompileObjectTestGroup, CacheCompileCommand_Invalid) {

‎buildcc/lib/target/test/target/test_target_external_lib.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ TEST_GROUP(TargetTestExternalLib)
2727
};
2828
// clang-format on
2929

30-
static buildcc::Toolchaingcc(buildcc::Toolchain::Id::Gcc,"gcc","as","gcc",
30+
static buildcc::Toolchaingcc(buildcc::ToolchainId::Gcc,"gcc","as","gcc",
3131
"g++","ar","ld");
3232

3333
staticconst fs::path intermediate_path =

‎buildcc/lib/target/test/target/test_target_failure_states.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ TEST_GROUP(TargetTestFailureStates)
2525
};
2626
// clang-format on
2727

28-
static buildcc::Toolchaingcc(buildcc::Toolchain::Id::Gcc,"gcc","as","gcc",
28+
static buildcc::Toolchaingcc(buildcc::ToolchainId::Gcc,"gcc","as","gcc",
2929
"g++","ar","ld");
3030

3131
TEST(TargetTestFailureStates, StartTaskEnvFailure) {

‎buildcc/lib/target/test/target/test_target_flags.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
// Constants
2323

24-
static buildcc::Toolchaingcc(buildcc::Toolchain::Id::Gcc,"gcc","as","gcc",
24+
static buildcc::Toolchaingcc(buildcc::ToolchainId::Gcc,"gcc","as","gcc",
2525
"g++","ar","ld");
2626

2727
// ------------- PREPROCESSOR FLAGS ---------------

‎buildcc/lib/target/test/target/test_target_include_dir.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ TEST_GROUP(TargetTestIncludeDirGroup)
2626
};
2727
// clang-format on
2828

29-
static buildcc::Toolchaingcc(buildcc::Toolchain::Id::Gcc,"gcc","as","gcc",
29+
static buildcc::Toolchaingcc(buildcc::ToolchainId::Gcc,"gcc","as","gcc",
3030
"g++","ar","ld");
3131

3232
staticconst fs::path target_include_dir_intermediate_path =

‎buildcc/lib/target/test/target/test_target_lib_dep.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ TEST_GROUP(TargetTestLibDep)
3030
};
3131
// clang-format on
3232

33-
static buildcc::Toolchaingcc(buildcc::Toolchain::Id::Gcc,"gcc","as","gcc",
33+
static buildcc::Toolchaingcc(buildcc::ToolchainId::Gcc,"gcc","as","gcc",
3434
"g++","ar","ld");
3535

3636
staticconst fs::path intermediate_path =

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp