From de1c29b3761c4a91d6b3a4f83b746c7947fb850d Mon Sep 17 00:00:00 2001
From: Arsentiy Milchakov <milcars@mapswithme.com>
Date: Thu, 6 Apr 2017 20:02:53 +0300
Subject: preparation for std migration

---
 coding/read_write_utils.hpp | 4 ++--
 coding/reader.hpp           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'coding')

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));
-- 
cgit v1.2.3