|
Boost-Commit : |
From: john_at_[hidden]
Date: 2007-11-20 11:57:33
Author: johnmaddock
Date: 2007-11-20 11:57:32 EST (Tue, 20 Nov 2007)
New Revision: 41259
URL: http://svn.boost.org/trac/boost/changeset/41259
Log:
Added warning suppression for VC-9.
Text files modified:
trunk/boost/type_traits/is_abstract.hpp | 7 +++++++
trunk/boost/type_traits/is_base_and_derived.hpp | 7 +++++++
trunk/boost/type_traits/is_convertible.hpp | 2 +-
trunk/boost/type_traits/is_function.hpp | 7 +++++++
trunk/boost/type_traits/is_member_function_pointer.hpp | 7 +++++++
5 files changed, 29 insertions(+), 1 deletions(-)
Modified: trunk/boost/type_traits/is_abstract.hpp
==============================================================================
--- trunk/boost/type_traits/is_abstract.hpp (original)
+++ trunk/boost/type_traits/is_abstract.hpp 2007-11-20 11:57:32 EST (Tue, 20 Nov 2007)
@@ -85,7 +85,14 @@
#ifdef __GNUC__
BOOST_STATIC_CONSTANT(unsigned, s1 = sizeof(is_abstract_imp2<T>::template check_sig<T>(0)));
#else
+#if BOOST_WORKAROUND(BOOST_MSVC, > 1400)
+#pragma warning(push)
+#pragma warning(disable:6334)
+#endif
BOOST_STATIC_CONSTANT(unsigned, s1 = sizeof(check_sig<T>(0)));
+#if BOOST_WORKAROUND(BOOST_MSVC, > 1400)
+#pragma warning(pop)
+#endif
#endif
BOOST_STATIC_CONSTANT(bool, value =
Modified: trunk/boost/type_traits/is_base_and_derived.hpp
==============================================================================
--- trunk/boost/type_traits/is_base_and_derived.hpp (original)
+++ trunk/boost/type_traits/is_base_and_derived.hpp 2007-11-20 11:57:32 EST (Tue, 20 Nov 2007)
@@ -129,6 +129,10 @@
template<typename B, typename D>
struct is_base_and_derived_impl2
{
+#if BOOST_WORKAROUND(BOOST_MSVC, > 1400)
+#pragma warning(push)
+#pragma warning(disable:6334)
+#endif
//
// May silently do the wrong thing with incomplete types
// unless we trap them here:
@@ -148,6 +152,9 @@
BOOST_STATIC_CONSTANT(bool, value =
sizeof(bd_helper<B,D>::check_sig(Host(), 0)) == sizeof(type_traits::yes_type));
+#if BOOST_WORKAROUND(BOOST_MSVC, > 1400)
+#pragma warning(pop)
+#endif
};
#else
Modified: trunk/boost/type_traits/is_convertible.hpp
==============================================================================
--- trunk/boost/type_traits/is_convertible.hpp (original)
+++ trunk/boost/type_traits/is_convertible.hpp 2007-11-20 11:57:32 EST (Tue, 20 Nov 2007)
@@ -249,7 +249,7 @@
static From _m_from;
#ifdef BOOST_MSVC
#pragma warning(push)
-#pragma warning(disable:4244)
+#pragma warning(disable:4244 6334)
#endif
BOOST_STATIC_CONSTANT(bool, value =
sizeof( _m_check(_m_from) ) == sizeof(::boost::type_traits::yes_type)
Modified: trunk/boost/type_traits/is_function.hpp
==============================================================================
--- trunk/boost/type_traits/is_function.hpp (original)
+++ trunk/boost/type_traits/is_function.hpp 2007-11-20 11:57:32 EST (Tue, 20 Nov 2007)
@@ -62,11 +62,18 @@
template <typename T>
struct is_function_impl
{
+#if BOOST_WORKAROUND(BOOST_MSVC, > 1400)
+#pragma warning(push)
+#pragma warning(disable:6334)
+#endif
static T* t;
BOOST_STATIC_CONSTANT(
bool, value = sizeof(::boost::type_traits::is_function_ptr_tester(t))
== sizeof(::boost::type_traits::yes_type)
);
+#if BOOST_WORKAROUND(BOOST_MSVC, > 1400)
+#pragma warning(pop)
+#endif
};
#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
Modified: trunk/boost/type_traits/is_member_function_pointer.hpp
==============================================================================
--- trunk/boost/type_traits/is_member_function_pointer.hpp (original)
+++ trunk/boost/type_traits/is_member_function_pointer.hpp 2007-11-20 11:57:32 EST (Tue, 20 Nov 2007)
@@ -62,6 +62,10 @@
{
template <typename T> struct result_
{
+#if BOOST_WORKAROUND(BOOST_MSVC, > 1400)
+#pragma warning(push)
+#pragma warning(disable:6334)
+#endif
static T* make_t;
typedef result_<T> self_type;
@@ -69,6 +73,9 @@
bool, value = (
1 == sizeof(::boost::type_traits::is_mem_fun_pointer_tester(self_type::make_t))
));
+#if BOOST_WORKAROUND(BOOST_MSVC, > 1400)
+#pragma warning(pop)
+#endif
};
};
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk