diff options
author | Arsentiy Milchakov <milcars@mapswithme.com> | 2017-04-06 20:02:53 +0300 |
---|---|---|
committer | Sergey Yershov <syershov@maps.me> | 2017-04-19 22:04:09 +0300 |
commit | de1c29b3761c4a91d6b3a4f83b746c7947fb850d (patch) | |
tree | 25348c8442a2630e16239744d9c934d629370d61 /indexer | |
parent | a51f90985ae6d37c2a9c8397aad1a1bf79beeedd (diff) |
preparation for std migration
Diffstat (limited to 'indexer')
-rw-r--r-- | indexer/displacement_manager.hpp | 4 | ||||
-rw-r--r-- | indexer/indexer_tests/trie_test.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/indexer/displacement_manager.hpp b/indexer/displacement_manager.hpp index 6e7f43b19b..ba1e8112cc 100644 --- a/indexer/displacement_manager.hpp +++ b/indexer/displacement_manager.hpp @@ -56,7 +56,7 @@ private: }; static_assert(sizeof(CellFeaturePair) == 12, ""); #ifndef OMIM_OS_LINUX -static_assert(is_trivially_copyable<CellFeaturePair>::value, ""); +static_assert(std::is_trivially_copyable<CellFeaturePair>::value, ""); #endif class CellFeatureBucketTuple @@ -82,7 +82,7 @@ private: }; static_assert(sizeof(CellFeatureBucketTuple) == 16, ""); #ifndef OMIM_OS_LINUX -static_assert(is_trivially_copyable<CellFeatureBucketTuple>::value, ""); +static_assert(std::is_trivially_copyable<CellFeatureBucketTuple>::value, ""); #endif /// Displacement manager filters incoming single-point features to simplify runtime diff --git a/indexer/indexer_tests/trie_test.cpp b/indexer/indexer_tests/trie_test.cpp index 38265302bd..495e0d6762 100644 --- a/indexer/indexer_tests/trie_test.cpp +++ b/indexer/indexer_tests/trie_test.cpp @@ -46,7 +46,7 @@ class SingleValueSerializer { public: #if !defined(OMIM_OS_LINUX) - static_assert(is_trivially_copyable<TPrimitive>::value, ""); + static_assert(std::is_trivially_copyable<TPrimitive>::value, ""); #endif template <typename TWriter> @@ -64,7 +64,7 @@ public: using TSerializer = SingleValueSerializer<TValue>; #if !defined(OMIM_OS_LINUX) - static_assert(is_trivially_copyable<TPrimitive>::value, ""); + static_assert(std::is_trivially_copyable<TPrimitive>::value, ""); #endif ValueList() = default; |