[lmi-commits] [lmi] master 29fec503 13/24: Work around spurious clang "unused" warnings

[Greg Chicares]

branch: master
commit 29fec50356ae8c2a9ac1693b69dfa62cfe18e49e
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Work around spurious clang "unused" warnings
    
    Worked around a couple of spurious instances because these warnings
    could be valuable.
---
 compiler_clang_warnings.make |  2 --
 tn_range.tpp                 | 10 ++++++++++
 wx_new_test.cpp              |  3 +++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/compiler_clang_warnings.make b/compiler_clang_warnings.make
index 91c8c049..934d8cac 100644
--- a/compiler_clang_warnings.make
+++ b/compiler_clang_warnings.make
@@ -90,8 +90,6 @@ clang_cxx_warnings := \
   -Wno-unknown-pragmas \
   -Wno-unneeded-member-function \
   -Wno-unreachable-code-break \
-  -Wno-unused-macros \
-  -Wno-unused-template \
   -Wno-weak-template-vtables \
   -Wno-weak-vtables \
 
diff --git a/tn_range.tpp b/tn_range.tpp
index 578a7d79..84a42687 100644
--- a/tn_range.tpp
+++ b/tn_range.tpp
@@ -214,6 +214,12 @@ namespace
             }
     };
 
+// clang considers these two templates "unused" in the unit test only
+#if defined LMI_CLANG
+#   pragma clang diagnostic push
+#   pragma clang diagnostic ignored "-Wunused-template"
+#endif // defined LMI_CLANG
+
     template<typename T>
     bool is_exact_integer(T t)
     {
@@ -256,6 +262,10 @@ namespace
             }
     }
 
+#if defined LMI_CLANG
+#   pragma clang diagnostic pop
+#endif // defined LMI_CLANG
+
     template<typename T, int>
     struct bound_adjuster
     {};
diff --git a/wx_new_test.cpp b/wx_new_test.cpp
index 3ea4662e..1a4aab24 100644
--- a/wx_new_test.cpp
+++ b/wx_new_test.cpp
@@ -31,6 +31,9 @@
 // resulting in an object that wouldn't necessarily work here because
 // of unwanted shared-library attributes.
 #include "wx_new.cpp"
+#if defined UNIT_TESTING_WX_NEW
+// This meaningless test avoids a clang '-Wunused-macros' warning.
+#endif // defined UNIT_TESTING_WX_NEW
 
 #include "test_tools.hpp"