Different approach at silencing MSVC warnings

Bjoe · Oct 13, 2018 · 3ca74a5 · 3ca74a5
1 parent ff6ed6c
commit 3ca74a5
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 3 deletions.
diff --git a/include/tao/pegtl/internal/apply.hpp b/include/tao/pegtl/internal/apply.hpp
@@ -9,6 +9,10 @@
 #include "apply_single.hpp"
 #include "skip_control.hpp"
 
+#ifdef _MSC_VER
+#include "silence.hpp"
+#endif
+
 #include "../analysis/counted.hpp"
 #include "../apply_mode.hpp"
 #include "../rewind_mode.hpp"
@@ -38,8 +42,9 @@ namespace tao
  return ( apply_single< Actions >::match( i2, st... ) && ... );
  }
  else {
- (void)in;
- (void)( (void)st, ... );
+#ifdef _MSC_VER
+ silence( in, st... );
+#endif
  return true;
  }
  }

diff --git a/include/tao/pegtl/internal/apply0.hpp b/include/tao/pegtl/internal/apply0.hpp
@@ -9,6 +9,10 @@
 #include "apply0_single.hpp"
 #include "skip_control.hpp"
 
+#ifdef _MSC_VER
+#include "silence.hpp"
+#endif
+
 #include "../analysis/counted.hpp"
 #include "../apply_mode.hpp"
 #include "../rewind_mode.hpp"
@@ -36,7 +40,9 @@ namespace tao
  return ( apply0_single< Actions >::match( st... ) && ... );
  }
  else {
- (void)( (void)st, ... );
+#ifdef _MSC_VER
+ silence( st... );
+#endif
  return true;
  }
  }

diff --git a/include/tao/pegtl/internal/silence.hpp b/include/tao/pegtl/internal/silence.hpp
@@ -0,0 +1,26 @@
+// Copyright (c) 2018 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef TAO_PEGTL_INTERNAL_SILENCE_HPP
+#define TAO_PEGTL_INTERNAL_SILENCE_HPP
+
+#include "../config.hpp"
+
+namespace tao
+{
+ namespace TAO_PEGTL_NAMESPACE
+ {
+ namespace internal
+ {
+ template< typename... Ts >
+ void silence( Ts&&... /*unused*/ ) noexcept
+ {
+ }
+
+ } // namespace internal
+
+ } // namespace TAO_PEGTL_NAMESPACE
+
+} // namespace tao
+
+#endif