feedc0de/boost_type_traits
1
0
Fork 0
forked from boostorg/type_traits
Code Pull Requests Activity

Fixed MSVC warnings when using -Gr

Browse Source 
Fixed Borland warnings in conversion_traits.hpp


[SVN r12247]
This commit is contained in:
John Maddock
2002-01-08 12:59:19 +00:00
parent e650f59e68
commit c6fbfb05d2
4 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/boost/type_traits/composite_traits.hpp
View File

@@ -69,10 +69,10 @@ namespace detail{
{
pointer_helper(const volatile void*);
};
yes_type is_pointer_helper(pointer_helper);
no_type is_pointer_helper(...);
yes_type BOOST_TT_DECL is_pointer_helper(pointer_helper);
no_type BOOST_TT_DECL is_pointer_helper(...);
::boost::type_traits::no_type is_function_tester(...);
::boost::type_traits::no_type BOOST_TT_DECL is_function_tester(...);
template <class R>
::boost::type_traits::yes_type is_function_tester(R (*)(void));
template <class R, class A0>
@@ -140,7 +140,7 @@ template <class R, class A0, class A1, class A2, class A3, class A4, class A5, c
yes_type is_array_helper(const volatile void*, const volatile void*);
template <class T>
no_type is_array_helper(T*const volatile*, const volatile void*);
no_type is_array_helper(...);
no_type BOOST_TT_DECL is_array_helper(...);
} // namespace detail
template <typename T>
struct is_array
@@ -871,11 +871,11 @@ template <class R, class T, class A0, class A1, class A2, class A3, class A4, cl
::boost::type_traits::yes_type is_member_function_pointer_helper(R (T::*)(A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19, A20, A21, A22, A23, A24, A25, A26, A27, A28) const volatile);
template <class R, class T, class A0, class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9, class A10, class A11, class A12, class A13, class A14, class A15, class A16, class A17, class A18, class A19, class A20, class A21, class A22, class A23, class A24, class A25, class A26, class A27, class A28, class A29>
::boost::type_traits::yes_type is_member_function_pointer_helper(R (T::*)(A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19, A20, A21, A22, A23, A24, A25, A26, A27, A28, A29) const volatile);
::boost::type_traits::no_type is_member_function_pointer_helper(...);
::boost::type_traits::no_type BOOST_TT_DECL is_member_function_pointer_helper(...);
template <class R, class T>
::boost::type_traits::yes_type is_member_pointer_helper(R T::*);
::boost::type_traits::no_type is_member_pointer_helper(...);
::boost::type_traits::yes_type BOOST_TT_DECL is_member_pointer_helper(R T::*);
::boost::type_traits::no_type BOOST_TT_DECL is_member_pointer_helper(...);
}
template <typename T>

14
include/boost/type_traits/conversion_traits.hpp
View File

@@ -54,8 +54,8 @@ namespace detail{
struct from_not_void_conversion {
template <class From, class To>
struct n_bind {
static no_type _m_check(...);
static yes_type _m_check(To);
static no_type BOOST_TT_DECL _m_check(...);
static yes_type BOOST_TT_DECL _m_check(To);
public:
void foo(); // avoid warning about all members being private
static From _m_from;
@@ -98,19 +98,21 @@ template <class From, class To>
struct is_convertible_helper
{
private:
#pragma option push -w-8074
// This workaround for Borland breaks the EDG C++ frontend,
// so we only use it for Borland.
template <class T>
struct checker
{
static type_traits::no_type _m_check(...);
static type_traits::yes_type _m_check(T);
static type_traits::no_type BOOST_TT_DECL _m_check(...);
static type_traits::yes_type BOOST_TT_DECL _m_check(T);
};
static From _m_from;
public:
static const bool value = sizeof( checker<To>::_m_check(_m_from) ) == sizeof(type_traits::yes_type);
void foo(); // avoid warning about all members being private
#pragma option pop
};
template <class From, class To>
@@ -192,8 +194,8 @@ template <class From, class To>
struct is_convertible
{
private:
static type_traits::no_type _m_check(...);
static type_traits::yes_type _m_check(To);
static type_traits::no_type BOOST_TT_DECL _m_check(...);
static type_traits::yes_type BOOST_TT_DECL _m_check(To);
static From _m_from;
public:
BOOST_STATIC_CONSTANT(bool, value = sizeof( _m_check(_m_from) ) == sizeof(type_traits::yes_type));

10
include/boost/type_traits/fwd.hpp
View File

@@ -79,6 +79,16 @@
# define BOOST_HAS_TRIVIAL_DESTRUCTOR(T) false
#endif
//
// whenever we have a conversion function with elipses
// it needs to be declared _cdecl to suppress compiler
// warnings from MS and Borland compilers:
#if defined(BOOST_MSVC) || defined(__BORLANDC__)
#define BOOST_TT_DECL _cdecl
#else
#define BOOST_TT_DECL
#endif
namespace boost{
//

4
include/boost/type_traits/same_traits.hpp
View File

@@ -77,8 +77,8 @@ struct is_same {
namespace detail{
template <class T>
::boost::type_traits::yes_type is_same_helper(T*, T*);
::boost::type_traits::no_type is_same_helper(...);
::boost::type_traits::yes_type BOOST_TT_DECL is_same_helper(T*, T*);
::boost::type_traits::no_type BOOST_TT_DECL is_same_helper(...);
}
template <typename T, typename U>