X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fjson_helper.hpp;h=15d72c33717f054b19e82838eed99a96f3b95446;hb=refs%2Ftags%2F5.0.0;hp=b9d3c92e2081f2c06192a0ddb6e7436bc91b4573;hpb=397ad714d8a0ddc3f0b9d5cbcbd68aec9cbe55d0;p=staging%2Fwindowmanager.git diff --git a/src/json_helper.hpp b/src/json_helper.hpp index b9d3c92..15d72c3 100644 --- a/src/json_helper.hpp +++ b/src/json_helper.hpp @@ -1,9 +1,25 @@ +/* + * Copyright (C) 2017 Mentor Graphics Development (Deutschland) GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #ifndef TMCAGLWM_JSON_HELPER_HPP #define TMCAGLWM_JSON_HELPER_HPP -#include -#include "wayland.hpp" #include "result.hpp" +#include "wayland.hpp" +#include struct json_object; @@ -11,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 const &v); -// We ned to manually unwrap numbers -template -wm::result get(nlohmann::json const &j) { - // DB(j); - T r; - std::istringstream s(j.get()); - s >> r; - return !s.eof() || s.fail() ? wm::Err("Could not read int") : wm::Ok(r); -} - #endif // TMCAGLWM_JSON_HELPER_HPP