diff --git a/td/generate/tl_json_converter.cpp b/td/generate/tl_json_converter.cpp index bb16fb34..fff68557 100644 --- a/td/generate/tl_json_converter.cpp +++ b/td/generate/tl_json_converter.cpp @@ -31,7 +31,7 @@ void gen_to_json_constructor(StringBuilder &sb, const T *constructor, bool is_he } sb << " {\n"; sb << " auto jo = jv.enter_object();\n"; - sb << " jo << ctie(\"@type\", \"" << tl::simple::gen_cpp_name(constructor->name) << "\");\n"; + sb << " jo(\"@type\", \"" << tl::simple::gen_cpp_name(constructor->name) << "\");\n"; for (auto &arg : constructor->args) { auto field = tl::simple::gen_cpp_field_name(arg.name); // TODO: or as null @@ -49,7 +49,7 @@ void gen_to_json_constructor(StringBuilder &sb, const T *constructor, bool is_he arg.type->vector_value_type->type == tl::simple::Type::Int64) { object = PSTRING() << "JsonVectorInt64{" << object << "}"; } - sb << " jo << ctie(\"" << arg.name << "\", ToJson(" << object << "));\n"; + sb << " jo(\"" << arg.name << "\", ToJson(" << object << "));\n"; if (is_custom) { sb << " }\n"; } diff --git a/td/telegram/JsonValue.cpp b/td/telegram/JsonValue.cpp index dfd82805..35ac523d 100644 --- a/td/telegram/JsonValue.cpp +++ b/td/telegram/JsonValue.cpp @@ -177,7 +177,7 @@ class JsonableJsonValue : public Jsonable { if (!check_utf8(member->key_)) { LOG(ERROR) << "Have incorrect UTF-8 object key " << member->key_; } else { - object << ctie(member->key_, JsonableJsonValue(member->value_.get())); + object(member->key_, JsonableJsonValue(member->value_.get())); } } } diff --git a/tdutils/td/utils/JsonBuilder.h b/tdutils/td/utils/JsonBuilder.h index 2b3cf6e8..d013d9d2 100644 --- a/tdutils/td/utils/JsonBuilder.h +++ b/tdutils/td/utils/JsonBuilder.h @@ -15,20 +15,11 @@ #include "td/utils/StringBuilder.h" #include -#include #include #include namespace td { -template -std::tuple ctie(const Args &... args) TD_WARN_UNUSED_RESULT; - -template -std::tuple ctie(const Args &... args) { - return std::tie(args...); -} - class JsonTrue { public: friend StringBuilder &operator<<(StringBuilder &sb, const JsonTrue &val) { @@ -411,10 +402,6 @@ class JsonObjectScope : public JsonScope { *sb_ << "}"; } template - JsonObjectScope &operator<<(std::tuple key_value) { - return (*this)(std::get<0>(key_value), std::get<1>(key_value)); - } - template JsonObjectScope &operator<<(std::pair key_value) { return (*this)(key_value.first, key_value.second); } @@ -603,7 +590,7 @@ class JsonValue : public Jsonable { case Type::Object: { auto object = scope->enter_object(); for (auto &key_value : get_object()) { - object << ctie(JsonString(key_value.first), key_value.second); + object(JsonString(key_value.first), key_value.second); } break; } diff --git a/tdutils/test/json.cpp b/tdutils/test/json.cpp index fbb4ae06..abb48872 100644 --- a/tdutils/test/json.cpp +++ b/tdutils/test/json.cpp @@ -48,7 +48,7 @@ TEST(JSON, object) { StringBuilder sb(MutableSlice{tmp, sizeof(tmp)}); JsonBuilder jb(std::move(sb)); auto c = jb.enter_object(); - c << std::tie("key", "value"); + c("key", "value"); c << std::make_pair("1", 2); c.leave(); ASSERT_EQ(jb.string_builder().is_error(), false);