From 620e5d95cdb387acc3f351c8e2de5debde2ffe5f Mon Sep 17 00:00:00 2001 From: levlam Date: Fri, 2 Feb 2018 01:44:51 +0300 Subject: [PATCH] Fix formatting. GitOrigin-RevId: 4c44f261be6bddbce9b24ce28d177313753b603d --- CHANGELOG.md | 2 +- example/java/td_jni.cpp | 2 +- td/tl/tl_jni_object.cpp | 2 +- td/tl/tl_jni_object.h | 4 ++-- tdactor/td/actor/impl/ActorInfo-decl.h | 1 - 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 075fb9b3b..348c000a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ Changes in 1.1.0: - Replaced fields `text` and `text_entities` with the field `text` of type `formattedText` in class `game`. - Removed field `parse_mode` from class `inputMessageText`. - Added synchronous method `parseTextEntities`. -* updateNewMessage is now sent for all sent messages. +* updateNewMessage is now sent for all sent messages. * updateChatLastMessage is now sent when any field of the last message in a chat changes. * Reworked the `registerDevice` method: - Added parameter `other_user_ids` to method `registerDevice` to support multiple accounts. diff --git a/example/java/td_jni.cpp b/example/java/td_jni.cpp index 2638f592f..b9ba74a40 100644 --- a/example/java/td_jni.cpp +++ b/example/java/td_jni.cpp @@ -153,6 +153,6 @@ static jint register_native(JavaVM *vm) { } // namespace td_jni JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) { - static jint jni_version = td_jni::register_native(vm); // call_once + static jint jni_version = td_jni::register_native(vm); // call_once return jni_version; } diff --git a/td/tl/tl_jni_object.cpp b/td/tl/tl_jni_object.cpp index ab685f82f..1ba4f6e3d 100644 --- a/td/tl/tl_jni_object.cpp +++ b/td/tl/tl_jni_object.cpp @@ -79,7 +79,7 @@ void register_native_method(JNIEnv *env, jclass clazz, std::string name, std::st std::unique_ptr get_jni_env(JavaVM *java_vm, jint jni_version) { JNIEnv *env = nullptr; if (java_vm->GetEnv(reinterpret_cast(&env), jni_version) == JNI_EDETACHED) { -#ifdef JDK1_2 // if not Android JNI +#ifdef JDK1_2 // if not Android JNI auto p_env = reinterpret_cast(&env); #else auto p_env = &env; diff --git a/td/tl/tl_jni_object.h b/td/tl/tl_jni_object.h index d32ed75b7..418d47df9 100644 --- a/td/tl/tl_jni_object.h +++ b/td/tl/tl_jni_object.h @@ -50,12 +50,12 @@ class JvmThreadDetacher { } public: - explicit JvmThreadDetacher(JavaVM *java_vm): java_vm_(java_vm) { + explicit JvmThreadDetacher(JavaVM *java_vm) : java_vm_(java_vm) { } JvmThreadDetacher(const JvmThreadDetacher &other) = delete; JvmThreadDetacher &operator=(const JvmThreadDetacher &other) = delete; - JvmThreadDetacher(JvmThreadDetacher &&other): java_vm_(other.java_vm_) { + JvmThreadDetacher(JvmThreadDetacher &&other) : java_vm_(other.java_vm_) { other.java_vm_ = nullptr; } JvmThreadDetacher &operator=(JvmThreadDetacher &&other) = delete; diff --git a/tdactor/td/actor/impl/ActorInfo-decl.h b/tdactor/td/actor/impl/ActorInfo-decl.h index 214ba62f9..de9fba794 100644 --- a/tdactor/td/actor/impl/ActorInfo-decl.h +++ b/tdactor/td/actor/impl/ActorInfo-decl.h @@ -94,7 +94,6 @@ class ActorInfo vector mailbox_; bool is_lite() const; - bool can_flush_mailbox() const; void set_wait_generation(uint32 wait_generation); bool must_wait(uint32 wait_generation) const;