From 46652e39e64fc179e883933a5f418e472d525bfe Mon Sep 17 00:00:00 2001 From: Beman Dawes Date: Mon, 4 Nov 2002 18:15:57 +0000 Subject: [PATCH] missing || [SVN r16100] --- include/boost/type_traits/is_convertible.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/boost/type_traits/is_convertible.hpp b/include/boost/type_traits/is_convertible.hpp index 12c451e..fa9f383 100644 --- a/include/boost/type_traits/is_convertible.hpp +++ b/include/boost/type_traits/is_convertible.hpp @@ -126,7 +126,7 @@ struct is_convertible_impl }; #elif (defined(BOOST_MSVC) && (BOOST_MSVC >= 1310))\ - (defined(__EDG_VERSION__) && (__EDG_VERSION__ >= 245) && !defined(__ICL)) + || (defined(__EDG_VERSION__) && (__EDG_VERSION__ >= 245) && !defined(__ICL)) // // This is *almost* an ideal world implementation as it doesn't rely // on undefined behaviour by passing UDT's through (...).