diff options
| author |   Marcus Fritzsch <marcus_fritzsch@mentor.com> | 2017-08-15 16:00:51 +0200 |
|---|---|---|
| committer | Marcus Fritzsch <marcus_fritzsch@mentor.com> | 2017-08-15 16:32:20 +0200 |
| commit | d08e5d1a943b65ece5ca519c200ab2c0359f51d7 (patch) | |
| tree | 142f0a878c31aa84024c23418e24196108417686 /src | |
| parent | 90058eca3f26be0ad4139465eacec236ec08a980 (diff) | |
layers: remove last remnants of get<T> to read ints from json
Signed-off-by: Marcus Fritzsch <marcus_fritzsch@mentor.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/json_helper.hpp | 10 | ||||
| -rw-r--r-- | src/layers.cpp | 2 |
2 files changed, 1 insertions, 11 deletions
diff --git a/src/json_helper.hpp b/src/json_helper.hpp index 68aaa08..15d72c3 100644 --- a/src/json_helper.hpp +++ b/src/json_helper.hpp @@ -27,14 +27,4 @@ json_object *to_json(genivi::screen const *s); json_object *to_json(genivi::controller::props_map const &s); json_object *to_json(std::vector<uint32_t> const &v); -// We ned to manually unwrap numbers -template <typename T> -wm::result<T> get(nlohmann::json const &j) { - // DB(j); - T r; - std::istringstream s(j.get<std::string>()); - s >> r; - return !s.eof() || s.fail() ? wm::Err<T>("Could not read int") : wm::Ok(r); -} - #endif // TMCAGLWM_JSON_HELPER_HPP diff --git a/src/layers.cpp b/src/layers.cpp index 0110f17..8f79451 100644 --- a/src/layers.cpp +++ b/src/layers.cpp @@ -67,7 +67,7 @@ struct result<struct layer_map> to_layer_map(nlohmann::json const &j) { auto msi = j.find("main_surface"); if (msi != j.end()) { - stl.main_surface = get<int>((*msi)["surface_id"]); + stl.main_surface = (*msi)["surface_id"]; } // Check lookup |