Skip to content

Commit 60ee8fe

Browse files
committed
fixes #352 - default to latest standard if none is provided
1 parent 59f376c commit 60ee8fe

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

simplecpp.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2617,7 +2617,7 @@ static void simplifySizeof(simplecpp::TokenList &expr, const std::map<std::strin
26172617
static bool isCpp17OrLater(const simplecpp::DUI &dui)
26182618
{
26192619
const std::string std_ver = simplecpp::getCppStdString(dui.std);
2620-
return !std_ver.empty() && (std_ver >= "201703L");
2620+
return std_ver.empty() || (std_ver >= "201703L");
26212621
}
26222622

26232623
static std::string openHeader(std::ifstream &f, const simplecpp::DUI &dui, const std::string &sourcefile, const std::string &header, bool systemheader);

test.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1373,7 +1373,8 @@ static void has_include_1()
13731373
ASSERT_EQUALS("\n\nA", preprocess(code, dui));
13741374
dui.std = "c++14";
13751375
ASSERT_EQUALS("", preprocess(code, dui));
1376-
ASSERT_EQUALS("", preprocess(code));
1376+
// we default to latest standard
1377+
ASSERT_EQUALS("\n\nA", preprocess(code));
13771378
}
13781379

13791380
static void has_include_2()
@@ -1388,7 +1389,6 @@ static void has_include_2()
13881389
simplecpp::DUI dui;
13891390
dui.std = "c++17";
13901391
ASSERT_EQUALS("\n\nA", preprocess(code, dui));
1391-
ASSERT_EQUALS("", preprocess(code));
13921392
}
13931393

13941394
static void has_include_3()
@@ -1407,7 +1407,6 @@ static void has_include_3()
14071407
// Unless -I is set (preferably, we should differentiate -I and -isystem...)
14081408
dui.includePaths.push_back("./testsuite");
14091409
ASSERT_EQUALS("\n\nA", preprocess(code, dui));
1410-
ASSERT_EQUALS("", preprocess(code));
14111410
}
14121411

14131412
static void has_include_4()
@@ -1422,7 +1421,6 @@ static void has_include_4()
14221421
simplecpp::DUI dui;
14231422
dui.std = "c++17";
14241423
ASSERT_EQUALS("\n\nA", preprocess(code, dui));
1425-
ASSERT_EQUALS("", preprocess(code));
14261424
}
14271425

14281426
static void has_include_5()
@@ -1437,7 +1435,6 @@ static void has_include_5()
14371435
simplecpp::DUI dui;
14381436
dui.std = "c++17";
14391437
ASSERT_EQUALS("\n\nA", preprocess(code, dui));
1440-
ASSERT_EQUALS("", preprocess(code));
14411438
}
14421439

14431440
static void ifdef1()
@@ -2647,6 +2644,7 @@ static void stdcVersionDefine()
26472644
simplecpp::DUI dui;
26482645
dui.std = "c11";
26492646
ASSERT_EQUALS("\n201112L", preprocess(code, dui));
2647+
ASSERT_EQUALS("\n202311L", preprocess(code)); // default to latest
26502648
}
26512649

26522650
static void cpluscplusDefine()
@@ -2657,6 +2655,7 @@ static void cpluscplusDefine()
26572655
simplecpp::DUI dui;
26582656
dui.std = "c++11";
26592657
ASSERT_EQUALS("\n201103L", preprocess(code, dui));
2658+
ASSERT_EQUALS("\n202400L", preprocess(code)); // default to latest
26602659
}
26612660

26622661
static void invalidStd()

0 commit comments

Comments
 (0)