From c989c7ec700533a7ce0c294c09a80d68ed0ad6a4 Mon Sep 17 00:00:00 2001 From: Dan Smith Date: Mon, 10 Jan 2022 10:41:48 -0500 Subject: [PATCH] fix #ifdef --- .../modules/c++/sys/include/sys/TypeTraits.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/externals/coda-oss/modules/c++/sys/include/sys/TypeTraits.h b/externals/coda-oss/modules/c++/sys/include/sys/TypeTraits.h index 047aba9a0..fff724b02 100644 --- a/externals/coda-oss/modules/c++/sys/include/sys/TypeTraits.h +++ b/externals/coda-oss/modules/c++/sys/include/sys/TypeTraits.h @@ -28,18 +28,18 @@ namespace sys { -template // workaround missing "is_trivially_copyable" in g++ < 5.0 #if defined(__GNUC__) && (__GNUC__ < 5) +template +struct IsTriviallyCopyable final +{ static_assert(CODA_OSS_cplusplus < 201402L, "C++14 must have is_trivially_copyable."); - struct IsTriviallyCopyable final - { - // https://stackoverflow.com/a/31798726/8877 - static constexpr bool value = __has_trivial_copy(T); - }; + // https://stackoverflow.com/a/31798726/8877 + static constexpr bool value = __has_trivial_copy(T); +}; #else - template - using IsTriviallyCopyable = std::is_trivially_copyable; +template +using IsTriviallyCopyable = std::is_trivially_copyable; #endif }