Add support for specifying the language standard to use

[builder.git] / source / buildinfo.cpp

diff --git a/source/buildinfo.cpp b/source/buildinfo.cpp
index 2246ad4b2d7a5ce97ac35997b951f427ab61982c..0e06a5908ff984d1e67def75d64e643106e47ace 100644 (file)
--- a/source/buildinfo.cpp
+++ b/source/buildinfo.cpp
@@ -62,6 +62,8 @@ void BuildInfo::update_from(const BuildInfo &bi, UpdateLevel level)
                libmode = bi.libmode;
                for(LibModeMap::const_iterator i=bi.libmodes.begin(); i!=bi.libmodes.end(); ++i)
                        libmodes[i->first] = i->second;
+               for(StandardMap::const_iterator i=bi.standards.begin(); i!=bi.standards.end(); ++i)
+                       standards[i->first] = i->second;
                debug = bi.debug;
                optimize = bi.optimize;
                strip = bi.strip;
@@ -87,6 +89,7 @@ BuildInfo::Loader::Loader(BuildInfo &bi):
        add("libmode",  &Loader::libmode_for_lib);
        add("local_incpath", &Loader::local_incpath);
        add("optimize", &BuildInfo::optimize);
+       add("standard", &Loader::standard);
        add("strip",    &BuildInfo::strip);
        add("sysroot",  &Loader::sysroot);
        add("threads",  &BuildInfo::threads);
@@ -124,6 +127,11 @@ void BuildInfo::Loader::local_incpath(const string &s)
        obj.local_incpath.push_back(s);
 }
 
+void BuildInfo::Loader::standard(DataFile::Symbol tag, const string &std)
+{
+       obj.standards[tag.name] = std;
+}
+
 void BuildInfo::Loader::sysroot(const string &s)
 {
        obj.sysroot = s;