More sophisticated handling of language standards

[builder.git] / source / msvccompiler.cpp

diff --git a/source/msvccompiler.cpp b/source/msvccompiler.cpp
index 12668a639c6dfc7db8941be12627ef52b520ba20..0e1a1f4e94158136737a077bb17d7362d6036875 100644 (file)
--- a/source/msvccompiler.cpp
+++ b/source/msvccompiler.cpp
@@ -107,9 +107,9 @@ Task *MsvcCompiler::run(const Target &target) const
 
        if(binfo.standards.count(tag))
        {
-               string std = get_item(binfo.standards, tag);
-               if(std!="c++11" && std!="c99")
-                       argv.push_back("/std:"+std);
+               const BuildInfo::LanguageStandard &std = get_item(binfo.standards, tag);
+               if((tag=="CXX" && std.year>2011) || (tag=="CC" && std.year>1999))
+                       argv.push_back("/std:"+std.str());
        }
 
        if(binfo.warning_level>=1)