Skip to content

Commit

Permalink
Merge pull request #3961 from STEllAR-GROUP/fixing_1403
Browse files Browse the repository at this point in the history
Making hpx::util::tuple<Ts...> and std::tuple<Ts...> convertible
  • Loading branch information
sithhell authored Sep 26, 2019
2 parents 22472e8 + 4f035dc commit c527771
Show file tree
Hide file tree
Showing 7 changed files with 290 additions and 110 deletions.
16 changes: 16 additions & 0 deletions libs/datastructures/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,24 @@

cmake_minimum_required(VERSION 3.3.2 FATAL_ERROR)

# Compatibility with using Boost.FileSystem, introduced in V1.4.0
hpx_option(HPX_DATASTRUCTURES_WITH_ADAPT_STD_TUPLE
BOOL "Enable compatibility of hpx::util::tuple with std::tuple. (default: ON)"
ON ADVANCED CATEGORY "Modules")

if(HPX_DATASTRUCTURES_WITH_ADAPT_STD_TUPLE)
hpx_add_config_define_namespace(
DEFINE HPX_DATASTRUCTURES_HAVE_ADAPT_STD_TUPLE
NAMESPACE DATASTRUCTURES)
endif()

set(datastructures_headers
hpx/datastructures/any.hpp
hpx/datastructures/tuple.hpp
hpx/datastructures/optional.hpp
hpx/datastructures/detail/pack.hpp
hpx/traits/supports_streaming_with_any.hpp
hpx/traits/is_tuple_like.hpp
)

set(datastructures_compat_headers
Expand Down Expand Up @@ -41,3 +53,7 @@ add_hpx_module(datastructures
hpx_type_support
CMAKE_SUBDIRS examples tests
)

if(HPX_DATASTRUCTURES_WITH_ADAPT_STD_TUPLE)
hpx_info(" Adapted hpx::util::tuple to be usable with std::tuple")
endif()
Loading

0 comments on commit c527771

Please sign in to comment.