saberbud/parallel-hashmap
1
0
Fork 0
mirror of https://github.com/greg7mdp/parallel-hashmap.git synced 2026-08-29 16:40:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

cleanup some build error with ICC 2019 (issue #9)

Browse Source
This commit is contained in:
greg
2019-05-10 19:48:31 -04:00
parent 470f0644c0
commit 141c4da24e
3 changed files with 17 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
parallel_hashmap/phmap_base.h
Vendored
+1 -1
View File
@@ -2550,7 +2550,7 @@ public:
template <typename U>
T value_or(U&& v) && { // NOLINT(build/c++11)
static_assert(std::is_move_constructible<value_type>::value,
"optional<T>::value_or: T must by copy constructible");
"optional<T>::value_or: T must by move constructible");
static_assert(std::is_convertible<U&&, value_type>::value,
"optional<T>::value_or: U must be convertible to T");
return static_cast<bool>(*this) ? std::move(**this)
parallel_hashmap/phmap_config.h
Vendored
+4 -23
View File
@@ -554,24 +554,12 @@
#define PHMAP_ATTRIBUTE_COLD
#endif
#if PHMAP_HAVE_CPP_ATTRIBUTE(clang::xray_always_instrument) && \
!defined(PHMAP_NO_XRAY_ATTRIBUTES)
#define PHMAP_XRAY_ALWAYS_INSTRUMENT [[clang::xray_always_instrument]]
#define PHMAP_XRAY_NEVER_INSTRUMENT [[clang::xray_never_instrument]]
#if PHMAP_HAVE_CPP_ATTRIBUTE(clang::xray_log_args)
#define PHMAP_XRAY_LOG_ARGS(N) \
[[clang::xray_always_instrument, clang::xray_log_args(N)]]
#if defined(__clang__)
#if PHMAP_HAVE_CPP_ATTRIBUTE(clang::reinitializes)
#define PHMAP_ATTRIBUTE_REINITIALIZES [[clang::reinitializes]]
#else
#define PHMAP_XRAY_LOG_ARGS(N) [[clang::xray_always_instrument]]
#define PHMAP_ATTRIBUTE_REINITIALIZES
#endif
#else
#define PHMAP_XRAY_ALWAYS_INSTRUMENT
#define PHMAP_XRAY_NEVER_INSTRUMENT
#define PHMAP_XRAY_LOG_ARGS(N)
#endif
#if PHMAP_HAVE_CPP_ATTRIBUTE(clang::reinitializes)
#define PHMAP_ATTRIBUTE_REINITIALIZES [[clang::reinitializes]]
#else
#define PHMAP_ATTRIBUTE_REINITIALIZES
#endif
@@ -601,13 +589,6 @@
#define PHMAP_ATTRIBUTE_FUNC_ALIGN(bytes)
#endif
#if PHMAP_HAVE_CPP_ATTRIBUTE(clang::require_constant_initialization)
#define PHMAP_CONST_INIT [[clang::require_constant_initialization]]
#else
#define PHMAP_CONST_INIT
#endif // PHMAP_HAVE_CPP_ATTRIBUTE(clang::require_constant_initialization)
// ----------------------------------------------------------------------
// Figure out SSE support
// ----------------------------------------------------------------------