Skip to content

Commit 89dcbba

Browse files
committed
forward std option string to simplecpp directly
1 parent 9dd0f16 commit 89dcbba

1 file changed

Lines changed: 8 additions & 3 deletions

File tree

lib/preprocessor.cpp

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -721,13 +721,18 @@ static simplecpp::DUI createDUI(const Settings &mSettings, const std::string &cf
721721
dui.undefined = mSettings.userUndefs; // -U
722722
dui.includePaths = mSettings.includePaths; // -I
723723
dui.includes = mSettings.userIncludes; // --include
724-
// TODO: use mSettings.standards.stdValue instead
725724
if (lang == Standards::Language::CPP) {
726-
dui.std = mSettings.standards.getCPP();
725+
dui.std = mSettings.standards.stdValueCPP;
726+
if (dui.std.empty()) {
727+
dui.std = mSettings.standards.getCPP();
728+
}
727729
splitcfg(mSettings.platform.getLimitsDefines(Standards::getCPP(dui.std)), dui.defines, "");
728730
}
729731
else if (lang == Standards::Language::C) {
730-
dui.std = mSettings.standards.getC();
732+
dui.std = mSettings.standards.stdValueC;
733+
if (dui.std.empty()) {
734+
dui.std = mSettings.standards.getC();
735+
}
731736
splitcfg(mSettings.platform.getLimitsDefines(Standards::getC(dui.std)), dui.defines, "");
732737
}
733738
dui.clearIncludeCache = mSettings.clearIncludeCache;

0 commit comments

Comments
 (0)