From 4614c621307e96c1fd8408846f26ebc0d7f23775 Mon Sep 17 00:00:00 2001
From: Edward Diener <eldiener@tropicsoft.com>
Date: Thu, 1 May 2014 01:20:12 -0400
Subject: [PATCH] Updated tests for strict compilers or VC++

---
 test/isempty.cxx                            | 6 ++++++
 test/isempty_failure.cxx                    | 2 +-
 test/isempty_failure2.cxx                   | 2 +-
 test/isempty_variadic_standard_failure.cxx  | 2 +-
 test/isempty_variadic_standard_failure2.cxx | 2 +-
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/test/isempty.cxx b/test/isempty.cxx
index cf2660f..bcf5b48 100644
--- a/test/isempty.cxx
+++ b/test/isempty.cxx
@@ -9,6 +9,10 @@
 #
 # /* See http://www.boost.org for most recent version. */
 #
+# include <boost/preprocessor/config/config.hpp>
+#
+#if (BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_STRICT()) || (BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_MSVC())
+
 # include <boost/preprocessor/facilities/empty.hpp>
 # include <boost/preprocessor/facilities/is_empty.hpp>
 # include <libs/preprocessor/test/test.h>
@@ -137,3 +141,5 @@ BEGIN BOOST_PP_IS_EMPTY(FUNC_GEN7) == 0 END
 BEGIN BOOST_PP_IS_EMPTY(FUNC_GEN9) == 0 END
 
 #endif
+
+#endif
diff --git a/test/isempty_failure.cxx b/test/isempty_failure.cxx
index f6a4179..72fbac3 100644
--- a/test/isempty_failure.cxx
+++ b/test/isempty_failure.cxx
@@ -12,7 +12,7 @@
 # include <boost/preprocessor/facilities/is_empty.hpp>
 # include <libs/preprocessor/test/test.h>
 
-#if !BOOST_PP_VARIADICS && (~BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_MSVC()) && (~BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_MWCC())
+#if !BOOST_PP_VARIADICS && (BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_STRICT()) && (~BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_MSVC()) && (~BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_MWCC())
 
 #define NAME &name
 
diff --git a/test/isempty_failure2.cxx b/test/isempty_failure2.cxx
index 397774b..eded627 100644
--- a/test/isempty_failure2.cxx
+++ b/test/isempty_failure2.cxx
@@ -12,7 +12,7 @@
 # include <boost/preprocessor/facilities/is_empty.hpp>
 # include <libs/preprocessor/test/test.h>
 
-#if !BOOST_PP_VARIADICS && (~BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_MSVC()) && (~BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_MWCC())
+#if !BOOST_PP_VARIADICS && (BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_STRICT()) && (~BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_MSVC()) && (~BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_MWCC())
 
 #define ATUPLE_PLUS (atuple) data
 
diff --git a/test/isempty_variadic_standard_failure.cxx b/test/isempty_variadic_standard_failure.cxx
index d4403bf..bfbbc9d 100644
--- a/test/isempty_variadic_standard_failure.cxx
+++ b/test/isempty_variadic_standard_failure.cxx
@@ -12,7 +12,7 @@
 # include <boost/preprocessor/facilities/is_empty.hpp>
 # include <libs/preprocessor/test/test.h>
 
-#if BOOST_PP_VARIADICS && !defined(BOOST_PP_VARIADICS_MSVC)
+#if BOOST_PP_VARIADICS && (BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_STRICT()) && !defined(BOOST_PP_VARIADICS_MSVC)
 
 #define FUNC_GEN8(x,y) (1,2,3)
   
diff --git a/test/isempty_variadic_standard_failure2.cxx b/test/isempty_variadic_standard_failure2.cxx
index 38a6600..d730626 100644
--- a/test/isempty_variadic_standard_failure2.cxx
+++ b/test/isempty_variadic_standard_failure2.cxx
@@ -12,7 +12,7 @@
 # include <boost/preprocessor/facilities/is_empty.hpp>
 # include <libs/preprocessor/test/test.h>
 
-#if BOOST_PP_VARIADICS && !defined(BOOST_PP_VARIADICS_MSVC)
+#if BOOST_PP_VARIADICS && (BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_STRICT()) && !defined(BOOST_PP_VARIADICS_MSVC)
 
 #define FUNC_GEN9(x,y,z) anything