Skip to content
Permalink
Browse files

Merge pull request #4126 from STEllAR-GROUP/fixing_basic_any

Attempt to fix basic_any constructor for gcc 7
  • Loading branch information...
msimberg committed Oct 9, 2019
2 parents 25fcb78 + 0ca44c8 commit d47b7ba34b70866defeefa7b0efc0e2dd069e4bf
Showing with 16 additions and 16 deletions.
  1. +3 −3 hpx/util/serializable_any.hpp
  2. +13 −13 libs/datastructures/include/hpx/datastructures/any.hpp
@@ -150,10 +150,10 @@ namespace hpx { namespace util {
}

// Perfect forwarding of T
template <typename T>
template <typename T,
typename Enable = typename std::enable_if<!std::is_same<basic_any,
typename std::decay<T>::type>::value>::type>
basic_any(T&& x,
typename std::enable_if<!std::is_same<basic_any,
typename std::decay<T>::type>::value>::type* = nullptr,
typename std::enable_if<std::is_copy_constructible<
typename std::decay<T>::type>::value>::type* = nullptr)
: table(detail::any::get_table<typename util::decay<T>::type>::
@@ -5,7 +5,7 @@
Copyright (c) Pablo Aguilar 2005
Copyright (c) Kevlin Henney 2001
// SPDX-License-Identifier: BSL-1.0
SPDX-License-Identifier: BSL-1.0
Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -629,10 +629,10 @@ namespace hpx { namespace util {
}

// Perfect forwarding of T
template <typename T>
template <typename T,
typename Enable = typename std::enable_if<!std::is_same<basic_any,
typename std::decay<T>::type>::value>::type>
basic_any(T&& x,
typename std::enable_if<!std::is_same<basic_any,
typename std::decay<T>::type>::value>::type* = nullptr,
typename std::enable_if<std::is_copy_constructible<
typename std::decay<T>::type>::value>::type* = nullptr)
: table(detail::any::get_table<typename std::decay<T>::type>::
@@ -849,10 +849,10 @@ namespace hpx { namespace util {
}

// Perfect forwarding of T
template <typename T>
template <typename T,
typename Enable = typename std::enable_if<!std::is_same<basic_any,
typename std::decay<T>::type>::value>::type>
basic_any(T&& x,
typename std::enable_if<!std::is_same<basic_any,
typename std::decay<T>::type>::value>::type* = nullptr,
typename std::enable_if<std::is_copy_constructible<
typename std::decay<T>::type>::value>::type* = nullptr)
: table(detail::any::get_table<typename std::decay<T>::type>::
@@ -1063,10 +1063,10 @@ namespace hpx { namespace util {
}

// Perfect forwarding of T
template <typename T>
template <typename T,
typename Enable = typename std::enable_if<!std::is_same<basic_any,
typename std::decay<T>::type>::value>::type>
basic_any(T&& x,
typename std::enable_if<!std::is_same<basic_any,
typename std::decay<T>::type>::value>::type* = nullptr,
typename std::enable_if<std::is_move_constructible<
typename std::decay<T>::type>::value>::type* = nullptr)
: table(detail::any::get_table<typename std::decay<T>::type>::
@@ -1250,10 +1250,10 @@ namespace hpx { namespace util {
}

// Perfect forwarding of T
template <typename T>
template <typename T,
typename Enable = typename std::enable_if<!std::is_same<basic_any,
typename std::decay<T>::type>::value>::type>
basic_any(T&& x,
typename std::enable_if<!std::is_same<basic_any,
typename std::decay<T>::type>::value>::type* = nullptr,
typename std::enable_if<std::is_move_constructible<
typename std::decay<T>::type>::value>::type* = nullptr)
: table(detail::any::get_table<typename std::decay<T>::type>::

0 comments on commit d47b7ba

Please sign in to comment.
You can’t perform that action at this time.