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

Merge branch 'develop' into Version2

Browse Source
This commit is contained in:
jzmaddock
2015-05-17 11:45:08 +01:00
parent dcfd3a880b 24b7d226d3
commit 4fb3457fe2
6 changed files with 59 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/is_copy_assignable_test.cpp
+1 -1
View File
@@ -22,7 +22,7 @@ struct has {
};
// MSVC can not generate neither default constructor, nor assignment operator,
// nor copy constructor for `has2` type. Supressing those warnings is essential,
// nor copy constructor for `has2` type. Suppressing those warnings is essential,
// because we treat warnings as errors in those tests
#if (defined _MSC_VER)
# pragma warning( push )
test/is_copy_constructible_test.cpp
+1 -1
View File
@@ -20,7 +20,7 @@ struct has {
};
// MSVC can not generate neither default constructor, nor assignment operator,
// nor copy constructor for `has2` type. Supressing those warnings is essential,
// nor copy constructor for `has2` type. Suppressing those warnings is essential,
// because we treat warnings as errors in those tests
#if (defined _MSC_VER)
# pragma warning( push )
test/is_virtual_base_of_test.cpp
+13
View File
@@ -38,6 +38,13 @@ public:
virtual int X();
};
//
// These are from https://svn.boost.org/trac/boost/ticket/11309
//
struct bug11309_A { int a; };
struct bug11309_B : public virtual bug11309_A {};
struct bug11309_C : public bug11309_A { virtual ~bug11309_C() {} };
TT_TEST_BEGIN(is_virtual_base_of)
BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_virtual_base_of<Derived,Base>::value), false);
@@ -75,6 +82,12 @@ BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_virtual_base_of<Base,virtual_inherit6>::
BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_virtual_base_of<virtual_inherit6,Base>::value), false);
BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_virtual_base_of<B,D>::value), false);
BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_virtual_base_of<non_virtual_base,non_virtual_derived>::value), false);
//
// Bug cases:
//
BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_virtual_base_of<bug11309_A, bug11309_C>::value), false);
BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_virtual_base_of<bug11309_A, bug11309_B>::value), true);
TT_TEST_END