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 /coding | |
| parent | a51f90985ae6d37c2a9c8397aad1a1bf79beeedd (diff) | |
preparation for std migration
Diffstat (limited to 'coding')
| -rw-r--r-- | coding/read_write_utils.hpp | 4 | ||||
| -rw-r--r-- | coding/reader.hpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/coding/read_write_utils.hpp b/coding/read_write_utils.hpp index 0536894a91..43ada6eefb 100644 --- a/coding/read_write_utils.hpp +++ b/coding/read_write_utils.hpp @@ -93,7 +93,7 @@ namespace rw /// This assert fails on std::pair<int, int> and OsmID class. /// @todo Review this logic in future with new compiler abilities. /// https://trello.com/c/hzCc9bzN/1254-is-trivial-copy-read-write-utils-hpp - //static_assert(is_trivially_copyable<ValueT>::value, ""); + //static_assert(std::is_trivially_copyable<ValueT>::value, ""); uint32_t const count = ReadVarUint<uint32_t>(src); if (count > 0) @@ -110,7 +110,7 @@ namespace rw /// This assert fails on std::pair<int, int> and OsmID class. /// @todo Review this logic in future with new compiler abilities. /// https://trello.com/c/hzCc9bzN/1254-is-trivial-copy-read-write-utils-hpp - //static_assert(is_trivially_copyable<ValueT>::value, ""); + //static_assert(std::is_trivially_copyable<ValueT>::value, ""); uint32_t const count = static_cast<uint32_t>(v.size()); WriteVarUint(sink, count); diff --git a/coding/reader.hpp b/coding/reader.hpp index 34d2d98ac0..52a7b750d7 100644 --- a/coding/reader.hpp +++ b/coding/reader.hpp @@ -255,7 +255,7 @@ template <typename TPrimitive, class TReader> inline TPrimitive ReadPrimitiveFromPos(TReader const & reader, uint64_t pos) { #ifndef OMIM_OS_LINUX - static_assert(is_trivially_copyable<TPrimitive>::value, ""); + static_assert(std::is_trivially_copyable<TPrimitive>::value, ""); #endif TPrimitive primitive; ReadFromPos(reader, pos, &primitive, sizeof(primitive)); @@ -266,7 +266,7 @@ template <typename TPrimitive, class TSource> TPrimitive ReadPrimitiveFromSource(TSource & source) { #ifndef OMIM_OS_LINUX - static_assert(is_trivially_copyable<TPrimitive>::value, ""); + static_assert(std::is_trivially_copyable<TPrimitive>::value, ""); #endif TPrimitive primitive; source.Read(&primitive, sizeof(primitive)); |