Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaria Volvenkova <d.volvenkova@corp.mail.ru>2019-08-06 19:41:55 +0300
committermpimenov <mpimenov@users.noreply.github.com>2019-08-07 14:29:18 +0300
commit60322166a5a22cbba2cce233a70c06b742b80103 (patch)
tree52f2711b38129f258d64d8bcbbcfb6f902497fed /coding/serdes_json.hpp
parent8f111ebda41fc1eeff459eb40498d2c4e2cccb1e (diff)
[bookmarks] Review fixes.
Diffstat (limited to 'coding/serdes_json.hpp')
-rw-r--r--coding/serdes_json.hpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/coding/serdes_json.hpp b/coding/serdes_json.hpp
index 07494f60cd..c306d382e1 100644
--- a/coding/serdes_json.hpp
+++ b/coding/serdes_json.hpp
@@ -173,8 +173,8 @@ public:
});
}
- template <typename Key, typename T>
- void operator()(std::pair<Key, T> const & p, char const * name = nullptr)
+ template <typename Key, typename Value>
+ void operator()(std::pair<Key, Value> const & p, char const * name = nullptr)
{
NewScopeWith(base::NewJSONObject(), name, [this, &p] {
(*this)(p.first, "key");
@@ -288,7 +288,7 @@ public:
MYTHROW(base::Json::Exception, ("The field", name, "must contain a json array."));
T tmp;
- size_t size = json_array_size(m_json);
+ size_t const size = json_array_size(m_json);
dest.reserve(size);
for (size_t index = 0; index < size; ++index)
{
@@ -316,7 +316,7 @@ public:
if (N != json_array_size(m_json))
{
MYTHROW(base::Json::Exception, ("The field", name, "must contain a json array of size", N,
- "but size is", json_array_size(m_json)));
+ "but size is", json_array_size(m_json)));
}
for (size_t index = 0; index < N; ++index)
@@ -341,7 +341,7 @@ public:
("The field", name, "must contain a json array.", json_dumps(m_json, 0)));
}
- size_t size = json_array_size(m_json);
+ size_t const size = json_array_size(m_json);
for (size_t index = 0; index < size; ++index)
{
json_t * context = SaveContext();
@@ -355,8 +355,8 @@ public:
RestoreContext(outerContext);
}
- template <typename Key, typename T>
- void operator()(std::pair<Key, T> & dst, char const * name = nullptr)
+ template <typename Key, typename Value>
+ void operator()(std::pair<Key, Value> & dst, char const * name = nullptr)
{
json_t * outerContext = SaveContext(name);
(*this)(dst.first, "key");