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

Add some workarounds for GCC-4.4.x

Browse Source
This commit is contained in:
jzmaddock
2015-07-07 18:16:18 +01:00
parent 04a8a9ecc2
commit 312bf1d8ce
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/boost/type_traits/is_constructible.hpp
View File

@ -12,7 +12,7 @@
#include <boost/type_traits/integral_constant.hpp>
#include <boost/detail/workaround.hpp>
#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_DECLTYPE) && !BOOST_WORKAROUND(BOOST_MSVC, < 1800)
#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_DECLTYPE) && !BOOST_WORKAROUND(BOOST_MSVC, < 1800) && !BOOST_WORKAROUND(BOOST_GCC_VERSION, < 40500)
#include <boost/type_traits/is_destructible.hpp>
#include <boost/type_traits/is_default_constructible.hpp>

2
include/boost/type_traits/is_default_constructible.hpp
View File

@ -12,7 +12,7 @@
#include <boost/type_traits/integral_constant.hpp>
#include <boost/detail/workaround.hpp>
#if !defined(BOOST_NO_CXX11_DECLTYPE) && !BOOST_WORKAROUND(BOOST_MSVC, < 1800)
#if !defined(BOOST_NO_CXX11_DECLTYPE) && !BOOST_WORKAROUND(BOOST_MSVC, < 1800) && !BOOST_WORKAROUND(BOOST_GCC_VERSION, < 40500)
#include <boost/type_traits/detail/yes_no_type.hpp>

2
test/has_trivial_move_assign_test.cpp
View File

@ -22,7 +22,7 @@ struct non_copyable_movable
non_copyable_movable(const non_copyable_movable&) = delete;
non_copyable_movable& operator=(const non_copyable_movable&) = delete;
//non_copyable_movable(non_copyable_movable&&) = default;
#if BOOST_WORKAROUND(BOOST_MSVC, <= 1800)
#if BOOST_WORKAROUND(BOOST_MSVC, <= 1800) || BOOST_WORKAROUND(BOOST_GCC_VERSION, < 40500)
non_copyable_movable& operator=(non_copyable_movable&& o)
{
val = std::move(o.val);

2
test/has_trivial_move_constructor_test.cpp
View File

@ -21,7 +21,7 @@ struct non_copyable_movable
non_copyable_movable(int);
non_copyable_movable(const non_copyable_movable&) = delete;
non_copyable_movable& operator=(const non_copyable_movable&) = delete;
#if BOOST_WORKAROUND(BOOST_MSVC, <= 1800)
#if BOOST_WORKAROUND(BOOST_MSVC, <= 1800) || BOOST_WORKAROUND(BOOST_GCC_VERSION, < 40500)
non_copyable_movable(non_copyable_movable&& o) : val(o.val){}
non_copyable_movable& operator=(non_copyable_movable&& o)
{