From a8b6e14fdce2c950a42cc007e0413c1635161fce Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 1 Jun 2017 13:10:15 +0200
Subject: Rename function not to clash with type

---
 build2/cc/compile.cxx | 14 +++++++-------
 build2/cc/compile.hxx |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'build2')

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;
-- 
cgit v1.1