commit 747b67d38f10492b5b06a215cd18a71c82bb0e23
author Junxiao Shi <git@mail1.yoursunny.com> Sun Oct 04 16:59:41 2015 -0700
committer Junxiao Shi <sunnylandh@gmail.com> Mon Oct 05 16:42:41 2015 -0700
tree 5b16a89bfae1562683c9cfa8f2594e2fb18ea52f
parent d7c96360782a1b7f50095aa212c1294fc207115f

build: downgrade keyword-macro from an error to a warning with clang

refs #3235

Change-Id: I48c95d8dd3e767b551618f7ec7fffc33fbd30fd6

.waf-tools/default-compiler-flags.py

diff --git a/.waf-tools/default-compiler-flags.py b/.waf-tools/default-compiler-flags.py
index b740ed9..f82fe10 100644
--- a/.waf-tools/default-compiler-flags.py
+++ b/.waf-tools/default-compiler-flags.py
@@ -130,6 +130,8 @@
             flags['CXXFLAGS'] += ['-std=c++0x']
         else:
             flags['CXXFLAGS'] += ['-std=c++11']
+        if version < (4, 8, 0):
+            flags['DEFINES'] += ['_GLIBCXX_USE_NANOSLEEP'] # Bug #2499
         return flags
 
     def getDebugFlags(self, conf):
@@ -159,6 +161,7 @@
                               '-Wno-unused-local-typedef', # Bugs #2657 and #3209
                               '-Wno-error=unneeded-internal-declaration', # Bug #1588
                               '-Wno-error=deprecated-register',
+                              '-Wno-error=keyword-macro', # Bug #3235
                               ]
         return flags