diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2017-06-01 13:10:15 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2017-06-01 13:11:07 +0200 |
| commit | a8b6e14fdce2c950a42cc007e0413c1635161fce (patch) | |
| tree | ca5c8733ae3cc781cd0fbfff830b6939c97a1bfa | |
| parent | ca8eb25ee3e891166e8b3fba0b0c4decd5aa4901 (diff) | |
Rename function not to clash with type
| -rw-r--r-- | build2/cc/compile.cxx | 14 | ||||
| -rw-r--r-- | build2/cc/compile.hxx | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/build2/cc/compile.cxx b/build2/cc/compile.cxx index 50c37aa..b0b7568 100644 --- a/build2/cc/compile.cxx +++ b/build2/cc/compile.cxx @@ -72,7 +72,7 @@ namespace build2 } const char* compile:: - lang (const match_data& md) const + langopt (const match_data& md) const { bool m (md.mod); preprocessed p (md.pp); @@ -1311,7 +1311,7 @@ namespace build2 args.push_back (out.c_str ()); } - args.push_back (lang (md)); // Compile as. + args.push_back (langopt (md)); // Compile as. gen = args_gen = true; } else @@ -1345,7 +1345,7 @@ namespace build2 args.push_back ("^"); // Old versions can't do empty target name. args.push_back ("-x"); - args.push_back (lang (md)); + args.push_back (langopt (md)); if (pp != nullptr) { @@ -2168,7 +2168,7 @@ namespace build2 args.push_back ("/E"); args.push_back ("/C"); - args.push_back (lang (md)); // Compile as. + args.push_back (langopt (md)); // Compile as. } else { @@ -2188,7 +2188,7 @@ namespace build2 if (ps) { args.push_back ("-x"); - args.push_back (lang (md)); + args.push_back (langopt (md)); if (cid == compiler_id::gcc) { @@ -2479,7 +2479,7 @@ namespace build2 // Note: no way to indicate that the source if already preprocessed. args.push_back ("/c"); // Compile only. - args.push_back (lang (md)); // Compile as. + args.push_back (langopt (md)); // Compile as. args.push_back (rels.string ().c_str ()); // Note: rely on being last. } else @@ -2500,7 +2500,7 @@ namespace build2 // Note: the order of the following options is relied upon below. // args.push_back ("-x"); - args.push_back (lang (md)); + args.push_back (langopt (md)); if (md.pp == preprocessed::all) { diff --git a/build2/cc/compile.hxx b/build2/cc/compile.hxx index 893194e..30f101d 100644 --- a/build2/cc/compile.hxx +++ b/build2/cc/compile.hxx @@ -100,7 +100,7 @@ namespace build2 // Language selection option (for VC) or the value for the -x option. // const char* - lang (const match_data&) const; + langopt (const match_data&) const; private: const string rule_id; |