[Boost-commit] svn:boost r39945 - trunk/libs/parameter/test

From: nicola.musatti_at_[hidden]
Date: 2007-10-11 17:09:07

Author: nmusatti
Date: 2007-10-11 17:09:07 EDT (Thu, 11 Oct 2007)
New Revision: 39945
URL: http://svn.boost.org/trac/boost/changeset/39945

Log:
Updated to support C++Builder 2007 Update 3 (bcc32 5.9.2)
Text files modified: 
   trunk/libs/parameter/test/preprocessor.cpp |     2 +-                                      
   trunk/libs/parameter/test/sfinae.cpp       |     6 +++---                                  
   2 files changed, 4 insertions(+), 4 deletions(-)

Modified: trunk/libs/parameter/test/preprocessor.cpp
==============================================================================
--- trunk/libs/parameter/test/preprocessor.cpp	(original)
+++ trunk/libs/parameter/test/preprocessor.cpp	2007-10-11 17:09:07 EDT (Thu, 11 Oct 2007)
@@ -453,7 +453,7 @@
       , name = S("foo")
     );
 
-#ifndef BOOST_NO_SFINAE
+#if ! defined(BOOST_NO_SFINAE) && ! BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x592))
     assert(sfinae("foo") == 1);
     assert(sfinae(1) == 0);
 

Modified: trunk/libs/parameter/test/sfinae.cpp
==============================================================================
--- trunk/libs/parameter/test/sfinae.cpp	(original)
+++ trunk/libs/parameter/test/sfinae.cpp	2007-10-11 17:09:07 EDT (Thu, 11 Oct 2007)
@@ -9,7 +9,7 @@
 #include <string>
 #include <boost/type_traits/is_convertible.hpp>
 
-#ifndef BOOST_NO_SFINAE
+#if ! defined(BOOST_NO_SFINAE) && ! BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x592))
 # include <boost/utility/enable_if.hpp>
 # include <boost/type_traits/is_same.hpp>
 #endif 
@@ -70,7 +70,7 @@
       f_impl(args(a0, a1));
   }
 
-#ifndef BOOST_NO_SFINAE
+#if ! defined(BOOST_NO_SFINAE) && ! BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x592))
   // On compilers that actually support SFINAE, add another overload
   // that is an equally good match and can only be in the overload set
   // when the others are not.  This tests that the SFINAE is actually
@@ -96,7 +96,7 @@
     f("foo", 3.f);
     f(value = 3.f, name = "foo");
 
-#ifndef BOOST_NO_SFINAE
+#if ! defined(BOOST_NO_SFINAE) && ! BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x592))
     BOOST_TEST(f(3, 4) == 0);
 #endif
     return boost::report_errors();