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

Mostly fix is_virtual_base_of on Borland.

Browse Source 
[SVN r51988]
This commit is contained in:
John Maddock
2009-03-26 17:57:05 +00:00
parent 0ab92896c6
commit b253d45376
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/boost/type_traits/is_virtual_base_of.hpp
View File

@@ -36,21 +36,21 @@ struct is_virtual_base_of_impl
template<typename Base, typename Derived>
struct is_virtual_base_of_impl<Base, Derived, mpl::true_>
{
struct X : Derived, virtual Base
struct X : public virtual Derived, public virtual Base
{
X();
X(const X&);
X& operator=(const X&);
~X();
};
struct Y : Derived
struct Y : public virtual Derived
{
Y();
Y(const Y&);
Y& operator=(const Y&);
~Y();
};
BOOST_STATIC_CONSTANT(bool, value = sizeof(X)==sizeof(Y));
BOOST_STATIC_CONSTANT(bool, value = (sizeof(X)==sizeof(Y)));
};
template<typename Base, typename Derived>

3
test/is_virtual_base_of_test.cpp
View File

@@ -9,7 +9,6 @@
#include "check_integral_constant.hpp"
#include <boost/type_traits/is_virtual_base_of.hpp>
TT_TEST_BEGIN(is_virtual_base_of)
BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_virtual_base_of<Derived,Base>::value), false);
@@ -35,7 +34,9 @@ BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_virtual_base_of<Base,virtual_inherit1>::
BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_virtual_base_of<virtual_inherit1,Base>::value), false);
BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_virtual_base_of<Base,virtual_inherit2>::value), true);
BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_virtual_base_of<virtual_inherit2,Base>::value), false);
#ifndef BOOST_BROKEN_IS_BASE_AND_DERIVED
BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_virtual_base_of<Base,virtual_inherit3>::value), true);
#endif
BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_virtual_base_of<virtual_inherit3,Base>::value), false);
BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_virtual_base_of<boost::noncopyable,virtual_inherit4>::value), true);
BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_virtual_base_of<virtual_inherit4,boost::noncopyable>::value), false);

4
test/test.hpp
View File

@@ -368,8 +368,8 @@ struct polymorphic_derived2 : polymorphic_base
struct virtual_inherit1 : virtual Base { };
struct virtual_inherit2 : virtual_inherit1 { };
struct virtual_inherit3 : private virtual Base {};
struct virtual_inherit4 : private virtual boost::noncopyable {};
struct virtual_inherit5 : private virtual int_convertible {};
struct virtual_inherit4 : virtual boost::noncopyable {};
struct virtual_inherit5 : virtual int_convertible {};
typedef void foo0_t();
typedef void foo1_t(int);