Merge branch 'vs-Zc-inline' into release
This commit is contained in:
commit
0d89c1e87c
|
@ -164,6 +164,8 @@ static cmVS7FlagTable cmVS140CLFlagTable[] = {
|
|||
{ "TreatWChar_tAsBuiltInType", "Zc:wchar_t", "", "true", 0 },
|
||||
{ "ForceConformanceInForLoopScope", "Zc:forScope-", "", "false", 0 },
|
||||
{ "ForceConformanceInForLoopScope", "Zc:forScope", "", "true", 0 },
|
||||
{ "RemoveUnreferencedCodeData", "Zc:inline-", "", "false", 0 },
|
||||
{ "RemoveUnreferencedCodeData", "Zc:inline", "", "true", 0 },
|
||||
{ "RuntimeTypeInfo", "GR-", "", "false", 0 },
|
||||
{ "RuntimeTypeInfo", "GR", "", "true", 0 },
|
||||
{ "OpenMPSupport", "openmp-", "", "false", 0 },
|
||||
|
|
|
@ -171,6 +171,7 @@ static cmVS7FlagTable cmVS141CLFlagTable[] = {
|
|||
{ "TreatWChar_tAsBuiltInType", "Zc:wchar_t", "", "true", 0 },
|
||||
{ "ForceConformanceInForLoopScope", "Zc:forScope-", "", "false", 0 },
|
||||
{ "ForceConformanceInForLoopScope", "Zc:forScope", "", "true", 0 },
|
||||
{ "RemoveUnreferencedCodeData", "Zc:inline-", "", "false", 0 },
|
||||
{ "RemoveUnreferencedCodeData", "Zc:inline", "", "true", 0 },
|
||||
{ "EnforceTypeConversionRules", "Zc:rvalueCast-", "", "false", 0 },
|
||||
{ "EnforceTypeConversionRules", "Zc:rvalueCast", "", "true", 0 },
|
||||
|
|
Loading…
Reference in New Issue