Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix some typos in config tests #2163

Merged
merged 1 commit into from May 19, 2016
Merged

Fix some typos in config tests #2163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 9 additions & 9 deletions CMakeLists.txt
View file
Open in desktop
Expand Up @@ -787,6 +787,12 @@ hpx_check_for_cxx11_deleted_functions(
hpx_check_for_cxx11_explicit_cvt_ops(
REQUIRED "HPX needs support for C++11 explicit conversion operators")

hpx_check_for_cxx11_explicit_variadic_templates(
DEFINITIONS HPX_HAVE_CXX11_EXPLICIT_VARIADIC_TEMPLATES)

hpx_check_for_cxx11_extended_friend_declarations(
DEFINITIONS HPX_HAVE_CXX11_EXTENDED_FRIEND_DECLARATIONS)

hpx_check_for_cxx11_function_template_default_args(
REQUIRED "HPX needs support for C++11 defaulted function template arguments")

Expand Down Expand Up @@ -823,12 +829,6 @@ hpx_check_for_cxx11_variadic_macros(
hpx_check_for_cxx11_variadic_templates(
REQUIRED "HPX needs support for C++11 variadic templates")

hpx_check_for_cxx11_explicit_variadic_templates(
DEFINITIONS HPX_HAVE_CXX11_EXPLICIT_VARIADIC_TEMPLATES)

hpx_check_for_cxx11_extended_friend_declarations(
DEFINITIONS HPX_HAVE_CXX11_EXTENDED_FRIEND_DECLARATIONS)

# Check the availability of certain C++11 library features
hpx_check_for_cxx11_std_array(
DEFINITIONS HPX_HAVE_CXX11_STD_ARRAY)
Expand All @@ -854,6 +854,9 @@ hpx_check_for_cxx11_std_is_null_pointer(
hpx_check_for_cxx11_std_is_placeholder(
DEFINITIONS HPX_HAVE_CXX11_STD_IS_PLACEHOLDER)

hpx_check_for_cxx11_std_is_trivially_copyable(
DEFINITIONS HPX_HAVE_CXX11_STD_IS_TRIVIALLY_COPYABLE)

hpx_check_for_cxx11_std_lock_guard(
REQUIRED "HPX needs support for C++11 std::lock_guard")

Expand Down Expand Up @@ -881,9 +884,6 @@ hpx_check_for_cxx11_std_unordered_set(
hpx_check_for_cxx11_std_type_traits(
DEFINITIONS HPX_HAVE_CXX11_STD_TYPE_TRAITS)

hpx_check_for_cxx11_is_trivially_copyable(
DEFINITIONS HPX_HAVE_CXX11_IS_TRIVIALLY_COPYABLE)

# Check the availability of certain C++14 language features
hpx_check_for_cxx14_constexpr(
DEFINITIONS HPX_HAVE_CXX14_CONSTEXPR)
Expand Down
42 changes: 21 additions & 21 deletions cmake/HPX_AddConfigTest.cmake
View file
Open in desktop
Expand Up @@ -192,6 +192,20 @@ macro(hpx_check_for_cxx11_explicit_cvt_ops)
FILE ${ARGN})
endmacro()

###############################################################################
macro(hpx_check_for_cxx11_explicit_variadic_templates)
add_hpx_config_test(HPX_WITH_CXX11_EXPLICIT_VARIADIC_TEMPLATES
SOURCE cmake/tests/cxx11_explicit_variadic_templates.cpp
FILE ${ARGN})
endmacro()

###############################################################################
macro(hpx_check_for_cxx11_extended_friend_declarations)
add_hpx_config_test(HPX_WITH_CXX11_EXTENDED_FRIEND_DECLARATIONS
SOURCE cmake/tests/cxx11_extended_friend_declarations.cpp
FILE ${ARGN})
endmacro()

###############################################################################
macro(hpx_check_for_cxx11_function_template_default_args)
add_hpx_config_test(HPX_WITH_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
Expand Down Expand Up @@ -276,13 +290,6 @@ macro(hpx_check_for_cxx11_variadic_templates)
FILE ${ARGN})
endmacro()

###############################################################################
macro(hpx_check_for_cxx11_explicit_variadic_templates)
add_hpx_config_test(HPX_WITH_CXX11_EXPLICIT_VARIADIC_TEMPLATES
SOURCE cmake/tests/cxx11_explicit_variadic_templates.cpp
FILE ${ARGN})
endmacro()

###############################################################################
macro(hpx_check_for_cxx11_std_array)
add_hpx_config_test(HPX_WITH_CXX11_ARRAY
Expand Down Expand Up @@ -339,6 +346,13 @@ macro(hpx_check_for_cxx11_std_is_placeholder)
FILE ${ARGN})
endmacro()

###############################################################################
macro(hpx_check_for_cxx11_std_is_trivially_copyable)
add_hpx_config_test(HPX_WITH_CXX11_IS_TRIVIALLY_COPYABLE
SOURCE cmake/tests/cxx11_std_is_trivially_copyable.cpp
FILE ${ARGN})
endmacro()

###############################################################################
macro(hpx_check_for_cxx11_std_lock_guard)
add_hpx_config_test(HPX_WITH_CXX11_LOCK_GUARD
Expand Down Expand Up @@ -402,20 +416,6 @@ macro(hpx_check_for_cxx11_std_unordered_set)
FILE ${ARGN})
endmacro()

###############################################################################
macro(hpx_check_for_cxx11_extended_friend_declarations)
add_hpx_config_test(HPX_WITH_CXX11_EXTENDED_FRIEND_DECLARATIONS
SOURCE cmake/tests/cxx11_extended_friend_declarations.cpp
FILE ${ARGN})
endmacro()

###############################################################################
macro(hpx_check_for_cxx11_is_trivially_copyable)
add_hpx_config_test(HPX_WITH_CXX11_WITH_IS_TRIVIALLY_COPYABLE
SOURCE cmake/tests/cxx11_std_is_trivially_copyable.cpp
FILE ${ARGN})
endmacro()

###############################################################################
macro(hpx_check_for_cxx14_constexpr)
add_hpx_config_test(HPX_WITH_CXX14_CONSTEXPR
Expand Down
4 changes: 2 additions & 2 deletions cmake/tests/cxx11_std_is_trivially_copyable.cpp
View file
Open in desktop
@@ -1,5 +1,5 @@
////////////////////////////////////////////////////////////////////////////////
// Copyright (c) 2015 Agustin Berge
// Copyright (c) 2016 Hartmut Kaiser
//
// 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)
Expand All @@ -9,5 +9,5 @@

int main()
{
int check_is_triviallycopyable[std::is_trivially_copyable<int>::value ? 1 : -1];
int check_trivially_copyable[std::is_trivially_copyable<int>::value ? 1 : -1];
}
10 changes: 5 additions & 5 deletions hpx/parallel/util/transfer.hpp
View file
Open in desktop
Expand Up @@ -22,7 +22,7 @@ namespace hpx { namespace parallel { namespace util
namespace detail
{

#if defined(HPX_HAVE_CXX11_IS_TRIVIALLY_COPYABLE)
#if defined(HPX_HAVE_CXX11_STD_IS_TRIVIALLY_COPYABLE)
///////////////////////////////////////////////////////////////////////
template <typename InIter, typename OutIter>
HPX_FORCEINLINE static std::pair<InIter, OutIter>
Expand Down Expand Up @@ -60,7 +60,7 @@ namespace hpx { namespace parallel { namespace util
}
};

#if defined(HPX_HAVE_CXX11_IS_TRIVIALLY_COPYABLE)
#if defined(HPX_HAVE_CXX11_STD_IS_TRIVIALLY_COPYABLE)
template <>
struct copy_helper<hpx::traits::trivially_copyable_pointer_tag>
{
Expand Down Expand Up @@ -99,7 +99,7 @@ namespace hpx { namespace parallel { namespace util
}
};

#if defined(HPX_HAVE_CXX11_IS_TRIVIALLY_COPYABLE)
#if defined(HPX_HAVE_CXX11_STD_IS_TRIVIALLY_COPYABLE)
template <>
struct copy_n_helper<hpx::traits::trivially_copyable_pointer_tag>
{
Expand Down Expand Up @@ -138,7 +138,7 @@ namespace hpx { namespace parallel { namespace util
}
};

#if defined(HPX_HAVE_CXX11_IS_TRIVIALLY_COPYABLE)
#if defined(HPX_HAVE_CXX11_STD_IS_TRIVIALLY_COPYABLE)
template <>
struct move_helper<hpx::traits::trivially_copyable_pointer_tag>
{
Expand Down Expand Up @@ -177,7 +177,7 @@ namespace hpx { namespace parallel { namespace util
}
};

#if defined(HPX_HAVE_CXX11_IS_TRIVIALLY_COPYABLE)
#if defined(HPX_HAVE_CXX11_STD_IS_TRIVIALLY_COPYABLE)
template <>
struct move_n_helper<hpx::traits::trivially_copyable_pointer_tag>
{
Expand Down
2 changes: 1 addition & 1 deletion hpx/traits.hpp
View file
Open in desktop
Expand Up @@ -233,7 +233,7 @@ namespace hpx { namespace traits
///////////////////////////////////////////////////////////////////////////
struct general_pointer_tag {};

#if defined(HPX_HAVE_CXX11_IS_TRIVIALLY_COPYABLE)
#if defined(HPX_HAVE_CXX11_STD_IS_TRIVIALLY_COPYABLE)
struct trivially_copyable_pointer_tag : general_pointer_tag {};
#endif

Expand Down
2 changes: 1 addition & 1 deletion hpx/traits/is_bitwise_serializable.hpp
View file
Open in desktop
Expand Up @@ -14,7 +14,7 @@ namespace hpx { namespace traits
{
template <typename T>
struct is_bitwise_serializable
#ifdef HPX_HAVE_CXX11_IS_TRIVIALLY_COPYABLE
#ifdef HPX_HAVE_CXX11_STD_IS_TRIVIALLY_COPYABLE
: std::is_trivially_copyable<T>
#else
: std::is_arithmetic<T>
Expand Down
2 changes: 1 addition & 1 deletion hpx/traits/pointer_category.hpp
View file
Open in desktop
Expand Up @@ -25,7 +25,7 @@ namespace hpx { namespace traits
return general_pointer_tag();
}

#if defined(HPX_HAVE_CXX11_IS_TRIVIALLY_COPYABLE)
#if defined(HPX_HAVE_CXX11_STD_IS_TRIVIALLY_COPYABLE)

namespace detail {

Expand Down