Add cmake test for std::decay_t to fix cuda build

STEllAR-GROUP · Jan 17, 2018 · 8ef85e4 · 8ef85e4
1 parent 26fa6ed
commit 8ef85e4
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 2 deletions.
diff --git a/cmake/HPX_AddConfigTest.cmake b/cmake/HPX_AddConfigTest.cmake
@@ -630,6 +630,14 @@ macro(hpx_check_for_cxx14_return_type_deduction)
     CMAKECXXFEATURE cxx_return_type_deduction)
 endmacro()
 
+###############################################################################
+macro(hpx_check_for_cxx14_std_decay_t)
+  add_hpx_config_test(HPX_WITH_CXX14_STD_DECAY_T
+    SOURCE cmake/tests/cxx14_std_decay_t.cpp
+    FILE ${ARGN}
+    CMAKECXXFEATURE cxx_std::decay_t)
+endmacro()
+
 ###############################################################################
 macro(hpx_check_for_libfun_std_experimental_optional)
   add_hpx_config_test(HPX_WITH_LIBFUN_EXPERIMENTAL_OPTIONAL

diff --git a/cmake/HPX_PerformCxxFeatureTests.cmake b/cmake/HPX_PerformCxxFeatureTests.cmake
@@ -164,6 +164,9 @@ macro(hpx_perform_cxx_feature_tests)
     hpx_check_for_cxx14_std_integer_sequence(
       DEFINITIONS HPX_HAVE_CXX14_STD_INTEGER_SEQUENCE)
 
+    hpx_check_for_cxx14_std_decay_t(
+      DEFINITIONS HPX_HAVE_CXX14_STD_DECAY_T)
+
     hpx_check_for_cxx14_std_is_final(
       DEFINITIONS HPX_HAVE_CXX14_STD_IS_FINAL)
 

diff --git a/cmake/tests/cxx14_std_decay_t.cpp b/cmake/tests/cxx14_std_decay_t.cpp
@@ -0,0 +1,13 @@
+////////////////////////////////////////////////////////////////////////////////
+//  Copyright (c) 2018 Mikael Simberg
+//
+//  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)
+////////////////////////////////////////////////////////////////////////////////
+
+#include <type_traits>
+
+int main()
+{
+    std::decay_t<int> a;
+}
diff --git a/hpx/config.hpp b/hpx/config.hpp
@@ -20,6 +20,7 @@
 #include <hpx/config/compiler_native_tls.hpp>
 #include <hpx/config/compiler_specific.hpp>
 #include <hpx/config/constexpr.hpp>
+#include <hpx/config/decay_t.hpp>
 #include <hpx/config/defines.hpp>
 #include <hpx/config/emulate_deleted.hpp>
 #include <hpx/config/export_definitions.hpp>

diff --git a/hpx/config/decay_t.hpp b/hpx/config/decay_t.hpp
@@ -0,0 +1,17 @@
+//  Copyright (c) 2018 Mikael Simberg
+//
+//  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)
+
+#ifndef HPX_CONFIG_DECAY_T_HPP
+#define HPX_CONFIG_DECAY_T_HPP
+
+#include <hpx/config/defines.hpp>
+
+#if defined(HPX_HAVE_CXX14_DECAY_T)
+#define HPX_DECAY_T(T) std::decay_t<T>
+#else
+#define HPX_DECAY_T(T) typename std::decay<T>::type
+#endif
+
+#endif
diff --git a/hpx/util/optional.hpp b/hpx/util/optional.hpp
@@ -6,6 +6,8 @@
 #if !defined(HPX_UTIL_OPTIONAL_HPP)
 #define HPX_UTIL_OPTIONAL_HPP
 
+#include <hpx/config.hpp>
+
 #include <exception>
 #include <string>
 #include <stdexcept>
@@ -483,9 +485,9 @@ namespace hpx { namespace util
 
     ///////////////////////////////////////////////////////////////////////////
     template <typename T>
-    constexpr optional<std::decay_t<T>> make_optional(T && v)
+    constexpr optional<HPX_DECAY_T(T)> make_optional(T && v)
     {
-        return optional<std::decay_t<T>>(std::forward<T>(v));
+        return optional<HPX_DECAY_T(T)>(std::forward<T>(v));
     }
 
     template <typename T, typename ... Ts>