From 79df9bac53024fbd8f026fd3d67d347cbbcdd25a Mon Sep 17 00:00:00 2001 From: levlam Date: Sat, 3 Feb 2018 23:01:33 +0300 Subject: [PATCH] Accept slice in to_double. GitOrigin-RevId: 3e68b84972a15404ab6ec43b6c157289487b3a5b --- td/telegram/InlineQueriesManager.cpp | 2 +- td/tl/tl_json.h | 2 +- tdutils/td/utils/JsonBuilder.cpp | 2 +- tdutils/td/utils/misc.cpp | 2 +- tdutils/td/utils/misc.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/td/telegram/InlineQueriesManager.cpp b/td/telegram/InlineQueriesManager.cpp index 9282d7798..f54caa5a4 100644 --- a/td/telegram/InlineQueriesManager.cpp +++ b/td/telegram/InlineQueriesManager.cpp @@ -1409,7 +1409,7 @@ void InlineQueriesManager::on_get_inline_query_results(UserId bot_user_id, uint6 Location l(inline_message_geo->geo_); location->location_ = l.get_location_object(); } else { - auto coordinates = split(result->description_); + auto coordinates = split(Slice(result->description_)); Location l(to_double(coordinates.first), to_double(coordinates.second)); location->location_ = l.get_location_object(); } diff --git a/td/tl/tl_json.h b/td/tl/tl_json.h index e407bfba1..f8f21203d 100644 --- a/td/tl/tl_json.h +++ b/td/tl/tl_json.h @@ -122,7 +122,7 @@ inline Status from_json(double &to, JsonValue &from) { if (from.type() != JsonValue::Type::Number) { return Status::Error(PSLICE() << "Expected number, got " << from.type()); } - to = to_double(from.get_number().str()); + to = to_double(from.get_number()); return Status::OK(); } diff --git a/tdutils/td/utils/JsonBuilder.cpp b/tdutils/td/utils/JsonBuilder.cpp index 9ffe7720c..eb654f43c 100644 --- a/tdutils/td/utils/JsonBuilder.cpp +++ b/tdutils/td/utils/JsonBuilder.cpp @@ -623,7 +623,7 @@ Result get_json_object_double_field(JsonObject &object, Slice name, bool if (value.type() == JsonValue::Type::Null) { return default_value; } - return to_double(value.get_number().str()); + return to_double(value.get_number()); } Result get_json_object_string_field(JsonObject &object, Slice name, bool is_optional, string default_value) { diff --git a/tdutils/td/utils/misc.cpp b/tdutils/td/utils/misc.cpp index e61ef61a6..de90123e0 100644 --- a/tdutils/td/utils/misc.cpp +++ b/tdutils/td/utils/misc.cpp @@ -58,7 +58,7 @@ string oneline(Slice str) { return result; } -double to_double(CSlice str) { +double to_double(Slice str) { static TD_THREAD_LOCAL std::stringstream *ss; if (init_thread_local(ss)) { ss->imbue(std::locale::classic()); diff --git a/tdutils/td/utils/misc.h b/tdutils/td/utils/misc.h index 61003e144..56124d70d 100644 --- a/tdutils/td/utils/misc.h +++ b/tdutils/td/utils/misc.h @@ -264,7 +264,7 @@ typename std::enable_if::value, T>::type hex_to_integer(Slic return integer_value; } -double to_double(CSlice str); +double to_double(Slice str); template T clamp(T value, T min_value, T max_value) {