From 4a853594b0a27dca6576c64d7bb8e6f9340b066f Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Sun, 6 Aug 2017 14:23:38 +0200
Subject: Filter out warning as error options during preprocessing

---
 build2/utility.hxx | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

(limited to 'build2/utility.hxx')

diff --git a/build2/utility.hxx b/build2/utility.hxx
index f6f9fe9..b057add 100644
--- a/build2/utility.hxx
+++ b/build2/utility.hxx
@@ -277,23 +277,25 @@ namespace build2
   // Append all the values from a variable to the C-string list. T is either
   // target or scope. The variable is expected to be of type strings.
   //
+  // If excl is not NULL, then filter this option out (note: case sensitive).
+  //
   struct variable;
 
   template <typename T>
   void
-  append_options (cstrings&, T&, const variable&);
+  append_options (cstrings&, T&, const variable&, const char* excl = nullptr);
 
   template <typename T>
   void
-  append_options (cstrings&, T&, const char*);
+  append_options (cstrings&, T&, const char*, const char* excl = nullptr);
 
   template <typename T>
   void
-  append_options (strings&, T&, const variable&);
+  append_options (strings&, T&, const variable&, const char* excl = nullptr);
 
   template <typename T>
   void
-  append_options (strings&, T&, const char*);
+  append_options (strings&, T&, const char*, const char* excl = nullptr);
 
   template <typename T>
   void
@@ -309,28 +311,32 @@ namespace build2
   struct lookup;
 
   void
-  append_options (cstrings&, const lookup&);
+  append_options (cstrings&, const lookup&, const char* excl = nullptr);
 
   void
-  append_options (strings&, const lookup&);
+  append_options (strings&, const lookup&, const char* excl = nullptr);
 
   void
   hash_options (sha256&, const lookup&);
 
   void
-  append_options (cstrings&, const strings&);
+  append_options (cstrings&, const strings&, const char* excl = nullptr);
 
   void
-  append_options (strings&, const strings&);
+  append_options (strings&, const strings&, const char* excl = nullptr);
 
   void
   hash_options (sha256&, const strings&);
 
   void
-  append_options (cstrings&, const strings&, size_t);
+  append_options (cstrings&,
+                  const strings&, size_t,
+                  const char* excl = nullptr);
 
   void
-  append_options (strings&, const strings&, size_t);
+  append_options (strings&,
+                  const strings&, size_t,
+                  const char* excl = nullptr);
 
   void
   hash_options (sha256&, const strings&, size_t);
-- 
cgit v1.1