diff options
| author | ipknHama <ipknhama@gmail.com> | 2016-08-27 18:03:49 +0900 |
|---|---|---|
| committer | ipknHama <ipknhama@gmail.com> | 2016-08-27 18:03:49 +0900 |
| commit | e161da45e08a2eaaec747a784020d69f8223418d (patch) | |
| tree | 0e5c326565e4ddc8fd26d05715666faaf757315f /include/json.h | |
| parent | abc36e1b3ab2edf30ea07ea2a82a395ce312f6f6 (diff) | |
| download | crow-e161da45e08a2eaaec747a784020d69f8223418d.tar.gz crow-e161da45e08a2eaaec747a784020d69f8223418d.zip | |
Remove warnings: manually applying #101, #104
Diffstat (limited to 'include/json.h')
| -rw-r--r-- | include/json.h | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/include/json.h b/include/json.h index c2ce20e..3706034 100644 --- a/include/json.h +++ b/include/json.h @@ -92,7 +92,7 @@ namespace crow case type::Object: return "Object"; default: return "Unknown"; } - }; + } class rvalue; rvalue load(const char* data, size_t size); @@ -164,7 +164,7 @@ namespace crow return os; } private: - void force(char* s, uint32_t length) + void force(char* s, uint32_t /*length*/) { s_ = s; owned_ = 1; @@ -671,7 +671,7 @@ namespace crow //static const char* escaped = "\"\\/\b\f\n\r\t"; struct Parser { - Parser(char* data, size_t size) + Parser(char* data, size_t /*size*/) : data(data) { } @@ -1093,17 +1093,16 @@ namespace crow s = r.s(); return; case type::List: - l = std::move(std::unique_ptr<std::vector<wvalue>>(new std::vector<wvalue>{})); + l = std::unique_ptr<std::vector<wvalue>>(new std::vector<wvalue>{}); l->reserve(r.size()); for(auto it = r.begin(); it != r.end(); ++it) l->emplace_back(*it); return; case type::Object: - o = std::move( - std::unique_ptr< + o = std::unique_ptr< std::unordered_map<std::string, wvalue> >( - new std::unordered_map<std::string, wvalue>{})); + new std::unordered_map<std::string, wvalue>{}); for(auto it = r.begin(); it != r.end(); ++it) o->emplace(it->key(), *it); return; @@ -1249,7 +1248,7 @@ namespace crow reset(); t_ = type::List; if (!l) - l = std::move(std::unique_ptr<std::vector<wvalue>>(new std::vector<wvalue>{})); + l = std::unique_ptr<std::vector<wvalue>>(new std::vector<wvalue>{}); l->clear(); l->resize(v.size()); size_t idx = 0; @@ -1266,7 +1265,7 @@ namespace crow reset(); t_ = type::List; if (!l) - l = std::move(std::unique_ptr<std::vector<wvalue>>(new std::vector<wvalue>{})); + l = std::unique_ptr<std::vector<wvalue>>(new std::vector<wvalue>{}); if (l->size() < index+1) l->resize(index+1); return (*l)[index]; @@ -1287,8 +1286,7 @@ namespace crow reset(); t_ = type::Object; if (!o) - o = std::move( - std::unique_ptr< + o = std::unique_ptr< std::unordered_map<std::string, wvalue> >( new std::unordered_map<std::string, wvalue>{})); |