From 44b60d95ad3bf700a17c21eeeaaae0cef1cbcc03 Mon Sep 17 00:00:00 2001
From: Vesa Karvonen <vesa.karvonen@housemarque.fi>
Date: Sun, 16 Jun 2002 09:11:48 +0000
Subject: [PATCH] Removed MWCW workarounds from tests - tests are now less
 strict

[SVN r14151]
---
 test/logical_test.cpp      | 46 +++++++++++++++-----------------------
 test/preprocessor_test.cpp |  8 ++-----
 2 files changed, 20 insertions(+), 34 deletions(-)

diff --git a/test/logical_test.cpp b/test/logical_test.cpp
index 9636daa..16ec842 100644
--- a/test/logical_test.cpp
+++ b/test/logical_test.cpp
@@ -16,35 +16,25 @@
 
 /* *** */
 
-#if !(!defined(BOOST_NO_COMPILER_CONFIG) && defined(__MWERKS__))
-TEST_B BOOST_PP_NOT(MACRO MACRO_ARGS(0)) == 1 TEST_E
-#endif
-TEST_B BOOST_PP_NOT(1) == 0 TEST_E
+TEST_B BOOST_PP_NOT(0) == 1 TEST_E
+TEST_B BOOST_PP_NOT(2) == 0 TEST_E
 
-#if !(!defined(BOOST_NO_COMPILER_CONFIG) && defined(__MWERKS__))
-TEST_B BOOST_PP_AND(0,MACRO MACRO_ARGS(0)) == 0 TEST_E
-#endif
-TEST_B BOOST_PP_AND(0,1) == 0 TEST_E
-TEST_B BOOST_PP_AND(1,0) == 0 TEST_E
-TEST_B BOOST_PP_AND(1,1) == 1 TEST_E
+TEST_B BOOST_PP_AND(0,0) == 0 TEST_E
+TEST_B BOOST_PP_AND(0,3) == 0 TEST_E
+TEST_B BOOST_PP_AND(4,0) == 0 TEST_E
+TEST_B BOOST_PP_AND(5,6) == 1 TEST_E
 
-#if !(!defined(BOOST_NO_COMPILER_CONFIG) && defined(__MWERKS__))
-TEST_B BOOST_PP_OR(0,MACRO MACRO_ARGS(0)) == 0 TEST_E
-#endif
-TEST_B BOOST_PP_OR(0,1) == 1 TEST_E
-TEST_B BOOST_PP_OR(1,0) == 1 TEST_E
-TEST_B BOOST_PP_OR(1,1) == 1 TEST_E
+TEST_B BOOST_PP_OR(0,0) == 0 TEST_E
+TEST_B BOOST_PP_OR(0,7) == 1 TEST_E
+TEST_B BOOST_PP_OR(8,0) == 1 TEST_E
+TEST_B BOOST_PP_OR(9,1) == 1 TEST_E
 
-#if !(!defined(BOOST_NO_COMPILER_CONFIG) && defined(__MWERKS__))
-TEST_B BOOST_PP_XOR(0,MACRO MACRO_ARGS(0)) == 0 TEST_E
-#endif
-TEST_B BOOST_PP_XOR(0,1) == 1 TEST_E
-TEST_B BOOST_PP_XOR(1,0) == 1 TEST_E
-TEST_B BOOST_PP_XOR(1,1) == 0 TEST_E
+TEST_B BOOST_PP_XOR(0,0) == 0 TEST_E
+TEST_B BOOST_PP_XOR(0,2) == 1 TEST_E
+TEST_B BOOST_PP_XOR(3,0) == 1 TEST_E
+TEST_B BOOST_PP_XOR(4,5) == 0 TEST_E
 
-#if !(!defined(BOOST_NO_COMPILER_CONFIG) && defined(__MWERKS__))
-TEST_B BOOST_PP_NOR(0,MACRO MACRO_ARGS(0)) == 1 TEST_E
-#endif
-TEST_B BOOST_PP_NOR(0,1) == 0 TEST_E
-TEST_B BOOST_PP_NOR(1,0) == 0 TEST_E
-TEST_B BOOST_PP_NOR(1,1) == 0 TEST_E
+TEST_B BOOST_PP_NOR(0,0) == 1 TEST_E
+TEST_B BOOST_PP_NOR(0,6) == 0 TEST_E
+TEST_B BOOST_PP_NOR(7,0) == 0 TEST_E
+TEST_B BOOST_PP_NOR(8,9) == 0 TEST_E
diff --git a/test/preprocessor_test.cpp b/test/preprocessor_test.cpp
index 6931850..e897e7d 100644
--- a/test/preprocessor_test.cpp
+++ b/test/preprocessor_test.cpp
@@ -46,15 +46,11 @@ TEST_B BOOST_PP_EXPR_IF(1,1) TEST_E
 
 /* *** */
 
-#if !(!defined(BOOST_NO_COMPILER_CONFIG) && defined(__MWERKS__))
-TEST_B BOOST_PP_CAT(BOOST_PP_IF(1,tru,fals), MACRO MACRO_ARGS(e)) TEST_E
-#endif
+TEST_B BOOST_PP_CAT(BOOST_PP_IF(1,tru,fals), e) TEST_E
 
 /* *** */
 
-#if !(!defined(BOOST_NO_COMPILER_CONFIG) && defined(__MWERKS__))
-char stringize_test[2] = BOOST_PP_STRINGIZE(MACRO MACRO_ARGS(X));
-#endif
+char stringize_test[2] = BOOST_PP_STRINGIZE(__LINE__);
 
 /* *** */