From 144b2b3aadb65f421b3553bfc813b9bebf7c528d Mon Sep 17 00:00:00 2001 From: levlam Date: Sat, 20 Jan 2018 17:17:58 +0300 Subject: [PATCH] Make FileLocation.variant_ private. GitOrigin-RevId: 8360f98d879d860b763eb8ea45ef5bfbdefe3e05 --- td/telegram/files/FileLocation.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/td/telegram/files/FileLocation.h b/td/telegram/files/FileLocation.h index cfe25c8f..b6af573a 100644 --- a/td/telegram/files/FileLocation.h +++ b/td/telegram/files/FileLocation.h @@ -699,7 +699,6 @@ class RemoteFileLocation { public: enum class Type : int32 { Empty, Partial, Full }; Type type_; - Variant variant_; template void store(StorerT &storer) const { @@ -758,6 +757,11 @@ class RemoteFileLocation { RemoteFileLocation(FileType file_type, int64 id, int64 access_hash, DcId dc_id) : type_(Type::Full), variant_(FullRemoteFileLocation{file_type, id, access_hash, dc_id}) { } + + private: + Variant variant_; + + friend bool operator==(const RemoteFileLocation &lhs, const RemoteFileLocation &rhs); }; inline bool operator==(const RemoteFileLocation &lhs, const RemoteFileLocation &rhs) { @@ -880,7 +884,6 @@ class LocalFileLocation { public: enum class Type : int32 { Empty, Partial, Full }; Type type_; - Variant variant_; PartialLocalFileLocation &partial() { return variant_.get<1>(); @@ -931,6 +934,11 @@ class LocalFileLocation { LocalFileLocation(FileType file_type, string path, uint64 mtime_nsec) : type_(Type::Full), variant_(FullLocalFileLocation{file_type, std::move(path), mtime_nsec}) { } + + private: + Variant variant_; + + friend bool operator==(const LocalFileLocation &lhs, const LocalFileLocation &rhs); }; inline bool operator==(const LocalFileLocation &lhs, const LocalFileLocation &rhs) {