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

Tentative fixes for remaining msvc-11 failures.

Browse Source 
[SVN r83437]
This commit is contained in:
John Maddock
2013-03-15 13:27:03 +00:00
parent 2140b4c23c
commit 1554970121
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,8 +109,8 @@
// # define BOOST_ALIGNMENT_OF(T) __alignof(T)
# if defined(_MSC_VER) && (_MSC_VER >= 1700)
# define BOOST_HAS_TRIVIAL_MOVE_CONSTRUCTOR(T) (__has_trivial_move_constructor(T) || ( ::boost::is_pod<T>::value && !::boost::is_volatile<T>::value))
# define BOOST_HAS_TRIVIAL_MOVE_ASSIGN(T) (__has_trivial_move_assign(T) || ( ::boost::is_pod<T>::value && ! ::boost::is_const<T>::value && !::boost::is_volatile<T>::value))
# define BOOST_HAS_TRIVIAL_MOVE_CONSTRUCTOR(T) ((__has_trivial_move_constructor(T) || ::boost::is_pod<T>::value) && !::boost::is_volatile<T>::value)
# define BOOST_HAS_TRIVIAL_MOVE_ASSIGN(T) ((__has_trivial_move_assign(T) || ::boost::is_pod<T>::value) (&& ! ::boost::is_const<T>::value && !::boost::is_volatile<T>::value))
# endif
# define BOOST_HAS_TYPE_TRAITS_INTRINSICS

4
test/is_polymorphic_test.cpp
View File

@ -20,6 +20,10 @@
#include <windows.h> // more things to test
#endif
#if defined(BOOST_MSVC) && (_MSC_VER >= 1700)
#pragma warning(disable:4250)
#endif
// this test was added to check for bug reported on 21 May 2003:
struct poly_bug { virtual int foo() = 0; };