Просмотр исходного кода

Restoring authorship annotation for <paxakor@yandex-team.ru>. Commit 1 of 2.

paxakor 3 лет назад
Родитель
Сommit
7fdbed62e5

+ 5 - 5
contrib/libs/protobuf/python/ya.make

@@ -1,5 +1,5 @@
-PACKAGE()
-
+PACKAGE() 
+ 
 WITHOUT_LICENSE_TEXTS()
 
 LICENSE(BSD-3-Clause)
@@ -8,7 +8,7 @@ OWNER(
     g:contrib
     g:cpp-contrib
 )
-
+ 
 GENERATE_PY_PROTOS(contrib/libs/protobuf/src/google/protobuf/descriptor.proto)
-
-END()
+ 
+END() 

+ 12 - 12
contrib/libs/protobuf/src/google/protobuf/any.pb.h

@@ -218,12 +218,12 @@ class PROTOBUF_EXPORT Any final :
   };
   // string type_url = 1;
   void clear_type_url();
-  const TProtoStringType& type_url() const;
+  const TProtoStringType& type_url() const; 
   template <typename ArgT0 = const TProtoStringType&, typename... ArgT>
   void set_type_url(ArgT0&& arg0, ArgT... args);
-  TProtoStringType* mutable_type_url();
+  TProtoStringType* mutable_type_url(); 
   PROTOBUF_MUST_USE_RESULT TProtoStringType* release_type_url();
-  void set_allocated_type_url(TProtoStringType* type_url);
+  void set_allocated_type_url(TProtoStringType* type_url); 
   private:
   const TProtoStringType& _internal_type_url() const;
   inline PROTOBUF_ALWAYS_INLINE void _internal_set_type_url(const TProtoStringType& value);
@@ -232,12 +232,12 @@ class PROTOBUF_EXPORT Any final :
 
   // bytes value = 2;
   void clear_value();
-  const TProtoStringType& value() const;
+  const TProtoStringType& value() const; 
   template <typename ArgT0 = const TProtoStringType&, typename... ArgT>
   void set_value(ArgT0&& arg0, ArgT... args);
-  TProtoStringType* mutable_value();
+  TProtoStringType* mutable_value(); 
   PROTOBUF_MUST_USE_RESULT TProtoStringType* release_value();
-  void set_allocated_value(TProtoStringType* value);
+  void set_allocated_value(TProtoStringType* value); 
   private:
   const TProtoStringType& _internal_value() const;
   inline PROTOBUF_ALWAYS_INLINE void _internal_set_value(const TProtoStringType& value);
@@ -272,7 +272,7 @@ class PROTOBUF_EXPORT Any final :
 inline void Any::clear_type_url() {
   type_url_.ClearToEmpty();
 }
-inline const TProtoStringType& Any::type_url() const {
+inline const TProtoStringType& Any::type_url() const { 
   // @@protoc_insertion_point(field_get:google.protobuf.Any.type_url)
   return _internal_type_url();
 }
@@ -299,11 +299,11 @@ inline TProtoStringType* Any::_internal_mutable_type_url() {
   
   return type_url_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
 }
-inline TProtoStringType* Any::release_type_url() {
+inline TProtoStringType* Any::release_type_url() { 
   // @@protoc_insertion_point(field_release:google.protobuf.Any.type_url)
   return type_url_.Release(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
 }
-inline void Any::set_allocated_type_url(TProtoStringType* type_url) {
+inline void Any::set_allocated_type_url(TProtoStringType* type_url) { 
   if (type_url != nullptr) {
     
   } else {
@@ -318,7 +318,7 @@ inline void Any::set_allocated_type_url(TProtoStringType* type_url) {
 inline void Any::clear_value() {
   value_.ClearToEmpty();
 }
-inline const TProtoStringType& Any::value() const {
+inline const TProtoStringType& Any::value() const { 
   // @@protoc_insertion_point(field_get:google.protobuf.Any.value)
   return _internal_value();
 }
@@ -345,11 +345,11 @@ inline TProtoStringType* Any::_internal_mutable_value() {
   
   return value_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
 }
-inline TProtoStringType* Any::release_value() {
+inline TProtoStringType* Any::release_value() { 
   // @@protoc_insertion_point(field_release:google.protobuf.Any.value)
   return value_.Release(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
 }
-inline void Any::set_allocated_value(TProtoStringType* value) {
+inline void Any::set_allocated_value(TProtoStringType* value) { 
   if (value != nullptr) {
     
   } else {

+ 39 - 39
contrib/libs/protobuf/src/google/protobuf/api.pb.h

@@ -268,12 +268,12 @@ class PROTOBUF_EXPORT Api final :
 
   // string version = 4;
   void clear_version();
-  const TProtoStringType& version() const;
+  const TProtoStringType& version() const; 
   template <typename ArgT0 = const TProtoStringType&, typename... ArgT>
   void set_version(ArgT0&& arg0, ArgT... args);
-  TProtoStringType* mutable_version();
+  TProtoStringType* mutable_version(); 
   PROTOBUF_MUST_USE_RESULT TProtoStringType* release_version();
-  void set_allocated_version(TProtoStringType* version);
+  void set_allocated_version(TProtoStringType* version); 
   private:
   const TProtoStringType& _internal_version() const;
   inline PROTOBUF_ALWAYS_INLINE void _internal_set_version(const TProtoStringType& value);
@@ -469,12 +469,12 @@ class PROTOBUF_EXPORT Method final :
 
   // string name = 1;
   void clear_name();
-  const TProtoStringType& name() const;
+  const TProtoStringType& name() const; 
   template <typename ArgT0 = const TProtoStringType&, typename... ArgT>
   void set_name(ArgT0&& arg0, ArgT... args);
-  TProtoStringType* mutable_name();
+  TProtoStringType* mutable_name(); 
   PROTOBUF_MUST_USE_RESULT TProtoStringType* release_name();
-  void set_allocated_name(TProtoStringType* name);
+  void set_allocated_name(TProtoStringType* name); 
   private:
   const TProtoStringType& _internal_name() const;
   inline PROTOBUF_ALWAYS_INLINE void _internal_set_name(const TProtoStringType& value);
@@ -483,12 +483,12 @@ class PROTOBUF_EXPORT Method final :
 
   // string request_type_url = 2;
   void clear_request_type_url();
-  const TProtoStringType& request_type_url() const;
+  const TProtoStringType& request_type_url() const; 
   template <typename ArgT0 = const TProtoStringType&, typename... ArgT>
   void set_request_type_url(ArgT0&& arg0, ArgT... args);
-  TProtoStringType* mutable_request_type_url();
+  TProtoStringType* mutable_request_type_url(); 
   PROTOBUF_MUST_USE_RESULT TProtoStringType* release_request_type_url();
-  void set_allocated_request_type_url(TProtoStringType* request_type_url);
+  void set_allocated_request_type_url(TProtoStringType* request_type_url); 
   private:
   const TProtoStringType& _internal_request_type_url() const;
   inline PROTOBUF_ALWAYS_INLINE void _internal_set_request_type_url(const TProtoStringType& value);
@@ -497,12 +497,12 @@ class PROTOBUF_EXPORT Method final :
 
   // string response_type_url = 4;
   void clear_response_type_url();
-  const TProtoStringType& response_type_url() const;
+  const TProtoStringType& response_type_url() const; 
   template <typename ArgT0 = const TProtoStringType&, typename... ArgT>
   void set_response_type_url(ArgT0&& arg0, ArgT... args);
-  TProtoStringType* mutable_response_type_url();
+  TProtoStringType* mutable_response_type_url(); 
   PROTOBUF_MUST_USE_RESULT TProtoStringType* release_response_type_url();
-  void set_allocated_response_type_url(TProtoStringType* response_type_url);
+  void set_allocated_response_type_url(TProtoStringType* response_type_url); 
   private:
   const TProtoStringType& _internal_response_type_url() const;
   inline PROTOBUF_ALWAYS_INLINE void _internal_set_response_type_url(const TProtoStringType& value);
@@ -675,12 +675,12 @@ class PROTOBUF_EXPORT Mixin final :
   };
   // string name = 1;
   void clear_name();
-  const TProtoStringType& name() const;
+  const TProtoStringType& name() const; 
   template <typename ArgT0 = const TProtoStringType&, typename... ArgT>
   void set_name(ArgT0&& arg0, ArgT... args);
-  TProtoStringType* mutable_name();
+  TProtoStringType* mutable_name(); 
   PROTOBUF_MUST_USE_RESULT TProtoStringType* release_name();
-  void set_allocated_name(TProtoStringType* name);
+  void set_allocated_name(TProtoStringType* name); 
   private:
   const TProtoStringType& _internal_name() const;
   inline PROTOBUF_ALWAYS_INLINE void _internal_set_name(const TProtoStringType& value);
@@ -689,12 +689,12 @@ class PROTOBUF_EXPORT Mixin final :
 
   // string root = 2;
   void clear_root();
-  const TProtoStringType& root() const;
+  const TProtoStringType& root() const; 
   template <typename ArgT0 = const TProtoStringType&, typename... ArgT>
   void set_root(ArgT0&& arg0, ArgT... args);
-  TProtoStringType* mutable_root();
+  TProtoStringType* mutable_root(); 
   PROTOBUF_MUST_USE_RESULT TProtoStringType* release_root();
-  void set_allocated_root(TProtoStringType* root);
+  void set_allocated_root(TProtoStringType* root); 
   private:
   const TProtoStringType& _internal_root() const;
   inline PROTOBUF_ALWAYS_INLINE void _internal_set_root(const TProtoStringType& value);
@@ -728,7 +728,7 @@ class PROTOBUF_EXPORT Mixin final :
 inline void Api::clear_name() {
   name_.ClearToEmpty();
 }
-inline const TProtoStringType& Api::name() const {
+inline const TProtoStringType& Api::name() const { 
   // @@protoc_insertion_point(field_get:google.protobuf.Api.name)
   return _internal_name();
 }
@@ -755,11 +755,11 @@ inline TProtoStringType* Api::_internal_mutable_name() {
   
   return name_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
 }
-inline TProtoStringType* Api::release_name() {
+inline TProtoStringType* Api::release_name() { 
   // @@protoc_insertion_point(field_release:google.protobuf.Api.name)
   return name_.Release(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
 }
-inline void Api::set_allocated_name(TProtoStringType* name) {
+inline void Api::set_allocated_name(TProtoStringType* name) { 
   if (name != nullptr) {
     
   } else {
@@ -851,7 +851,7 @@ Api::options() const {
 inline void Api::clear_version() {
   version_.ClearToEmpty();
 }
-inline const TProtoStringType& Api::version() const {
+inline const TProtoStringType& Api::version() const { 
   // @@protoc_insertion_point(field_get:google.protobuf.Api.version)
   return _internal_version();
 }
@@ -878,11 +878,11 @@ inline TProtoStringType* Api::_internal_mutable_version() {
   
   return version_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
 }
-inline TProtoStringType* Api::release_version() {
+inline TProtoStringType* Api::release_version() { 
   // @@protoc_insertion_point(field_release:google.protobuf.Api.version)
   return version_.Release(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
 }
-inline void Api::set_allocated_version(TProtoStringType* version) {
+inline void Api::set_allocated_version(TProtoStringType* version) { 
   if (version != nullptr) {
     
   } else {
@@ -1047,7 +1047,7 @@ inline void Api::set_syntax(PROTOBUF_NAMESPACE_ID::Syntax value) {
 inline void Method::clear_name() {
   name_.ClearToEmpty();
 }
-inline const TProtoStringType& Method::name() const {
+inline const TProtoStringType& Method::name() const { 
   // @@protoc_insertion_point(field_get:google.protobuf.Method.name)
   return _internal_name();
 }
@@ -1074,11 +1074,11 @@ inline TProtoStringType* Method::_internal_mutable_name() {
   
   return name_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
 }
-inline TProtoStringType* Method::release_name() {
+inline TProtoStringType* Method::release_name() { 
   // @@protoc_insertion_point(field_release:google.protobuf.Method.name)
   return name_.Release(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
 }
-inline void Method::set_allocated_name(TProtoStringType* name) {
+inline void Method::set_allocated_name(TProtoStringType* name) { 
   if (name != nullptr) {
     
   } else {
@@ -1093,7 +1093,7 @@ inline void Method::set_allocated_name(TProtoStringType* name) {
 inline void Method::clear_request_type_url() {
   request_type_url_.ClearToEmpty();
 }
-inline const TProtoStringType& Method::request_type_url() const {
+inline const TProtoStringType& Method::request_type_url() const { 
   // @@protoc_insertion_point(field_get:google.protobuf.Method.request_type_url)
   return _internal_request_type_url();
 }
@@ -1120,11 +1120,11 @@ inline TProtoStringType* Method::_internal_mutable_request_type_url() {
   
   return request_type_url_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
 }
-inline TProtoStringType* Method::release_request_type_url() {
+inline TProtoStringType* Method::release_request_type_url() { 
   // @@protoc_insertion_point(field_release:google.protobuf.Method.request_type_url)
   return request_type_url_.Release(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
 }
-inline void Method::set_allocated_request_type_url(TProtoStringType* request_type_url) {
+inline void Method::set_allocated_request_type_url(TProtoStringType* request_type_url) { 
   if (request_type_url != nullptr) {
     
   } else {
@@ -1159,7 +1159,7 @@ inline void Method::set_request_streaming(bool value) {
 inline void Method::clear_response_type_url() {
   response_type_url_.ClearToEmpty();
 }
-inline const TProtoStringType& Method::response_type_url() const {
+inline const TProtoStringType& Method::response_type_url() const { 
   // @@protoc_insertion_point(field_get:google.protobuf.Method.response_type_url)
   return _internal_response_type_url();
 }
@@ -1186,11 +1186,11 @@ inline TProtoStringType* Method::_internal_mutable_response_type_url() {
   
   return response_type_url_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
 }
-inline TProtoStringType* Method::release_response_type_url() {
+inline TProtoStringType* Method::release_response_type_url() { 
   // @@protoc_insertion_point(field_release:google.protobuf.Method.response_type_url)
   return response_type_url_.Release(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
 }
-inline void Method::set_allocated_response_type_url(TProtoStringType* response_type_url) {
+inline void Method::set_allocated_response_type_url(TProtoStringType* response_type_url) { 
   if (response_type_url != nullptr) {
     
   } else {
@@ -1286,7 +1286,7 @@ inline void Method::set_syntax(PROTOBUF_NAMESPACE_ID::Syntax value) {
 inline void Mixin::clear_name() {
   name_.ClearToEmpty();
 }
-inline const TProtoStringType& Mixin::name() const {
+inline const TProtoStringType& Mixin::name() const { 
   // @@protoc_insertion_point(field_get:google.protobuf.Mixin.name)
   return _internal_name();
 }
@@ -1313,11 +1313,11 @@ inline TProtoStringType* Mixin::_internal_mutable_name() {
   
   return name_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
 }
-inline TProtoStringType* Mixin::release_name() {
+inline TProtoStringType* Mixin::release_name() { 
   // @@protoc_insertion_point(field_release:google.protobuf.Mixin.name)
   return name_.Release(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
 }
-inline void Mixin::set_allocated_name(TProtoStringType* name) {
+inline void Mixin::set_allocated_name(TProtoStringType* name) { 
   if (name != nullptr) {
     
   } else {
@@ -1332,7 +1332,7 @@ inline void Mixin::set_allocated_name(TProtoStringType* name) {
 inline void Mixin::clear_root() {
   root_.ClearToEmpty();
 }
-inline const TProtoStringType& Mixin::root() const {
+inline const TProtoStringType& Mixin::root() const { 
   // @@protoc_insertion_point(field_get:google.protobuf.Mixin.root)
   return _internal_root();
 }
@@ -1359,11 +1359,11 @@ inline TProtoStringType* Mixin::_internal_mutable_root() {
   
   return root_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
 }
-inline TProtoStringType* Mixin::release_root() {
+inline TProtoStringType* Mixin::release_root() { 
   // @@protoc_insertion_point(field_release:google.protobuf.Mixin.root)
   return root_.Release(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
 }
-inline void Mixin::set_allocated_root(TProtoStringType* root) {
+inline void Mixin::set_allocated_root(TProtoStringType* root) { 
   if (root != nullptr) {
     
   } else {

+ 50 - 50
contrib/libs/protobuf/src/google/protobuf/descriptor.cc

@@ -462,7 +462,7 @@ typedef HASH_MAP<EnumIntPair, const EnumValueDescriptor*,
 // through all the extensions that extend a given Descriptor, and an
 // ordered data structure that implements lower_bound is convenient
 // for that.
-typedef std::map<DescriptorIntPair, const FieldDescriptor*>
+typedef std::map<DescriptorIntPair, const FieldDescriptor*> 
     ExtensionsGroupedByDescriptorMap;
 typedef HASH_MAP<TProtoStringType, const SourceCodeInfo_Location*>
     LocationsByPathMap;
@@ -589,7 +589,7 @@ class DescriptorPool::Tables {
   inline const FieldDescriptor* FindExtension(const Descriptor* extendee,
                                               int number) const;
   inline void FindAllExtensions(const Descriptor* extendee,
-                                std::vector<const FieldDescriptor*>* out) const;
+                                std::vector<const FieldDescriptor*>* out) const; 
 
   // -----------------------------------------------------------------
   // Adding items.
@@ -673,10 +673,10 @@ class DescriptorPool::Tables {
     int pending_files_before_checkpoint;
     int pending_extensions_before_checkpoint;
   };
-  std::vector<CheckPoint> checkpoints_;
+  std::vector<CheckPoint> checkpoints_; 
   std::vector<const char*> symbols_after_checkpoint_;
   std::vector<const char*> files_after_checkpoint_;
-  std::vector<DescriptorIntPair> extensions_after_checkpoint_;
+  std::vector<DescriptorIntPair> extensions_after_checkpoint_; 
 
   // Allocate some bytes which will be reclaimed when the pool is
   // destroyed.
@@ -743,14 +743,14 @@ class FileDescriptorTables {
   // Populates p->first->locations_by_path_ from p->second.
   // Unusual signature dictated by internal::call_once.
   static void BuildLocationsByPath(
-      std::pair<const FileDescriptorTables*, const SourceCodeInfo*>* p);
+      std::pair<const FileDescriptorTables*, const SourceCodeInfo*>* p); 
 
   // Returns the location denoted by the specified path through info,
   // or nullptr if not found.
   // The value of info must be that of the corresponding FileDescriptor.
   // (Conceptually a pure function, but stateful as an optimisation.)
   const SourceCodeInfo_Location* GetSourceLocation(
-      const std::vector<int>& path, const SourceCodeInfo* info) const;
+      const std::vector<int>& path, const SourceCodeInfo* info) const; 
 
   // Must be called after BuildFileImpl(), even if the build failed and
   // we are going to roll back to the last checkpoint.
@@ -1210,7 +1210,7 @@ void* DescriptorPool::Tables::AllocateBytes(int size) {
 }
 
 void FileDescriptorTables::BuildLocationsByPath(
-    std::pair<const FileDescriptorTables*, const SourceCodeInfo*>* p) {
+    std::pair<const FileDescriptorTables*, const SourceCodeInfo*>* p) { 
   for (int i = 0, len = p->second->location_size(); i < len; ++i) {
     const SourceCodeInfo_Location* loc = &p->second->location().Get(i);
     p->first->locations_by_path_[Join(loc->path(), ",")] = loc;
@@ -1218,8 +1218,8 @@ void FileDescriptorTables::BuildLocationsByPath(
 }
 
 const SourceCodeInfo_Location* FileDescriptorTables::GetSourceLocation(
-    const std::vector<int>& path, const SourceCodeInfo* info) const {
-  std::pair<const FileDescriptorTables*, const SourceCodeInfo*> p(
+    const std::vector<int>& path, const SourceCodeInfo* info) const { 
+  std::pair<const FileDescriptorTables*, const SourceCodeInfo*> p( 
       std::make_pair(this, info));
   internal::call_once(locations_by_path_once_,
                       FileDescriptorTables::BuildLocationsByPath, &p);
@@ -1554,7 +1554,7 @@ void DescriptorPool::FindAllExtensions(
   // (but do this only once per descriptor).
   if (fallback_database_ != nullptr &&
       tables_->extensions_loaded_from_db_.count(extendee) == 0) {
-    std::vector<int> numbers;
+    std::vector<int> numbers; 
     if (fallback_database_->FindAllExtensionNumbers(extendee->full_name(),
                                                     &numbers)) {
       for (int number : numbers) {
@@ -2262,7 +2262,7 @@ bool RetrieveOptionsAssumingRightPool(
     std::vector<TProtoStringType>* option_entries) {
   option_entries->clear();
   const Reflection* reflection = options.GetReflection();
-  std::vector<const FieldDescriptor*> fields;
+  std::vector<const FieldDescriptor*> fields; 
   reflection->ListFields(options, &fields);
   for (const FieldDescriptor* field : fields) {
     int count = 1;
@@ -2316,7 +2316,7 @@ bool RetrieveOptions(int depth, const Message& options,
       // descriptor.proto is not in the pool. This means no custom options are
       // used so we are safe to proceed with the compiled options message type.
       return RetrieveOptionsAssumingRightPool(depth, options, option_entries);
-    }
+    } 
     DynamicMessageFactory factory;
     std::unique_ptr<Message> dynamic_options(
         factory.GetPrototype(option_descriptor)->New());
@@ -2328,9 +2328,9 @@ bool RetrieveOptions(int depth, const Message& options,
                  << options.GetDescriptor()->full_name();
       return RetrieveOptionsAssumingRightPool(depth, options, option_entries);
     }
-  }
-}
-
+  } 
+} 
+ 
 // Formats options that all appear together in brackets. Does not include
 // brackets.
 bool FormatBracketedOptions(int depth, const Message& options,
@@ -2367,7 +2367,7 @@ class SourceLocationCommentPrinter {
         options.include_comments && desc->GetSourceLocation(&source_loc_);
   }
   SourceLocationCommentPrinter(const FileDescriptor* file,
-                               const std::vector<int>& path,
+                               const std::vector<int>& path, 
                                const TProtoStringType& prefix,
                                const DebugStringOptions& options)
       : options_(options), prefix_(prefix) {
@@ -2428,7 +2428,7 @@ TProtoStringType FileDescriptor::DebugStringWithOptions(
     const DebugStringOptions& debug_string_options) const {
   TProtoStringType contents;
   {
-    std::vector<int> path;
+    std::vector<int> path; 
     path.push_back(FileDescriptorProto::kSyntaxFieldNumber);
     SourceLocationCommentPrinter syntax_comment(this, path, "",
                                                 debug_string_options);
@@ -2441,8 +2441,8 @@ TProtoStringType FileDescriptor::DebugStringWithOptions(
   SourceLocationCommentPrinter comment_printer(this, "", debug_string_options);
   comment_printer.AddPreComment(&contents);
 
-  std::set<int> public_dependencies;
-  std::set<int> weak_dependencies;
+  std::set<int> public_dependencies; 
+  std::set<int> weak_dependencies; 
   public_dependencies.insert(public_dependencies_,
                              public_dependencies_ + public_dependency_count_);
   weak_dependencies.insert(weak_dependencies_,
@@ -2462,7 +2462,7 @@ TProtoStringType FileDescriptor::DebugStringWithOptions(
   }
 
   if (!package().empty()) {
-    std::vector<int> path;
+    std::vector<int> path; 
     path.push_back(FileDescriptorProto::kPackageFieldNumber);
     SourceLocationCommentPrinter package_comment(this, path, "",
                                                  debug_string_options);
@@ -2471,7 +2471,7 @@ TProtoStringType FileDescriptor::DebugStringWithOptions(
     package_comment.AddPostComment(&contents);
   }
 
-  if (FormatLineOptions(0, options(), pool(), &contents)) {
+  if (FormatLineOptions(0, options(), pool(), &contents)) { 
     contents.append("\n");  // add some space if we had options
   }
 
@@ -2482,7 +2482,7 @@ TProtoStringType FileDescriptor::DebugStringWithOptions(
 
   // Find all the 'group' type extensions; we will not output their nested
   // definitions (those will be done with their group field descriptor).
-  std::set<const Descriptor*> groups;
+  std::set<const Descriptor*> groups; 
   for (int i = 0; i < extension_count(); i++) {
     if (extension(i)->type() == FieldDescriptor::TYPE_GROUP) {
       groups.insert(extension(i)->message_type());
@@ -2550,12 +2550,12 @@ void Descriptor::DebugString(int depth, TProtoStringType* contents,
   }
   contents->append(" {\n");
 
-  FormatLineOptions(depth, options(), file()->pool(), contents);
+  FormatLineOptions(depth, options(), file()->pool(), contents); 
 
   // Find all the 'group' types for fields and extensions; we will not output
   // their nested definitions (those will be done with their group field
   // descriptor).
-  std::set<const Descriptor*> groups;
+  std::set<const Descriptor*> groups; 
   for (int i = 0; i < field_count(); i++) {
     if (field(i)->type() == FieldDescriptor::TYPE_GROUP) {
       groups.insert(field(i)->message_type());
@@ -2805,7 +2805,7 @@ void EnumDescriptor::DebugString(
 
   strings::SubstituteAndAppend(contents, "$0enum $1 {\n", prefix, name());
 
-  FormatLineOptions(depth, options(), file()->pool(), contents);
+  FormatLineOptions(depth, options(), file()->pool(), contents); 
 
   for (int i = 0; i < value_count(); i++) {
     value(i)->DebugString(depth, contents, debug_string_options);
@@ -2895,7 +2895,7 @@ void ServiceDescriptor::DebugString(
 
   strings::SubstituteAndAppend(contents, "service $0 {\n", name());
 
-  FormatLineOptions(1, options(), file()->pool(), contents);
+  FormatLineOptions(1, options(), file()->pool(), contents); 
 
   for (int i = 0; i < method_count(); i++) {
     method(i)->DebugString(1, contents, debug_string_options);
@@ -2948,7 +2948,7 @@ void MethodDescriptor::DebugString(
 
 // Location methods ===============================================
 
-bool FileDescriptor::GetSourceLocation(const std::vector<int>& path,
+bool FileDescriptor::GetSourceLocation(const std::vector<int>& path, 
                                        SourceLocation* out_location) const {
   GOOGLE_CHECK(out_location != nullptr);
   if (source_code_info_) {
@@ -2974,7 +2974,7 @@ bool FileDescriptor::GetSourceLocation(const std::vector<int>& path,
 }
 
 bool FileDescriptor::GetSourceLocation(SourceLocation* out_location) const {
-  std::vector<int> path;  // empty path for root FileDescriptor
+  std::vector<int> path;  // empty path for root FileDescriptor 
   return GetSourceLocation(path, out_location);
 }
 
@@ -2988,49 +2988,49 @@ bool FieldDescriptor::is_packed() const {
 }
 
 bool Descriptor::GetSourceLocation(SourceLocation* out_location) const {
-  std::vector<int> path;
+  std::vector<int> path; 
   GetLocationPath(&path);
   return file()->GetSourceLocation(path, out_location);
 }
 
 bool FieldDescriptor::GetSourceLocation(SourceLocation* out_location) const {
-  std::vector<int> path;
+  std::vector<int> path; 
   GetLocationPath(&path);
   return file()->GetSourceLocation(path, out_location);
 }
 
 bool OneofDescriptor::GetSourceLocation(SourceLocation* out_location) const {
-  std::vector<int> path;
+  std::vector<int> path; 
   GetLocationPath(&path);
   return containing_type()->file()->GetSourceLocation(path, out_location);
 }
 
 bool EnumDescriptor::GetSourceLocation(SourceLocation* out_location) const {
-  std::vector<int> path;
+  std::vector<int> path; 
   GetLocationPath(&path);
   return file()->GetSourceLocation(path, out_location);
 }
 
 bool MethodDescriptor::GetSourceLocation(SourceLocation* out_location) const {
-  std::vector<int> path;
+  std::vector<int> path; 
   GetLocationPath(&path);
   return service()->file()->GetSourceLocation(path, out_location);
 }
 
 bool ServiceDescriptor::GetSourceLocation(SourceLocation* out_location) const {
-  std::vector<int> path;
+  std::vector<int> path; 
   GetLocationPath(&path);
   return file()->GetSourceLocation(path, out_location);
 }
 
 bool EnumValueDescriptor::GetSourceLocation(
     SourceLocation* out_location) const {
-  std::vector<int> path;
+  std::vector<int> path; 
   GetLocationPath(&path);
   return type()->file()->GetSourceLocation(path, out_location);
 }
 
-void Descriptor::GetLocationPath(std::vector<int>* output) const {
+void Descriptor::GetLocationPath(std::vector<int>* output) const { 
   if (containing_type()) {
     containing_type()->GetLocationPath(output);
     output->push_back(DescriptorProto::kNestedTypeFieldNumber);
@@ -3041,7 +3041,7 @@ void Descriptor::GetLocationPath(std::vector<int>* output) const {
   }
 }
 
-void FieldDescriptor::GetLocationPath(std::vector<int>* output) const {
+void FieldDescriptor::GetLocationPath(std::vector<int>* output) const { 
   if (is_extension()) {
     if (extension_scope() == nullptr) {
       output->push_back(FileDescriptorProto::kExtensionFieldNumber);
@@ -3058,13 +3058,13 @@ void FieldDescriptor::GetLocationPath(std::vector<int>* output) const {
   }
 }
 
-void OneofDescriptor::GetLocationPath(std::vector<int>* output) const {
+void OneofDescriptor::GetLocationPath(std::vector<int>* output) const { 
   containing_type()->GetLocationPath(output);
   output->push_back(DescriptorProto::kOneofDeclFieldNumber);
   output->push_back(index());
 }
 
-void EnumDescriptor::GetLocationPath(std::vector<int>* output) const {
+void EnumDescriptor::GetLocationPath(std::vector<int>* output) const { 
   if (containing_type()) {
     containing_type()->GetLocationPath(output);
     output->push_back(DescriptorProto::kEnumTypeFieldNumber);
@@ -3075,18 +3075,18 @@ void EnumDescriptor::GetLocationPath(std::vector<int>* output) const {
   }
 }
 
-void EnumValueDescriptor::GetLocationPath(std::vector<int>* output) const {
+void EnumValueDescriptor::GetLocationPath(std::vector<int>* output) const { 
   type()->GetLocationPath(output);
   output->push_back(EnumDescriptorProto::kValueFieldNumber);
   output->push_back(index());
 }
 
-void ServiceDescriptor::GetLocationPath(std::vector<int>* output) const {
+void ServiceDescriptor::GetLocationPath(std::vector<int>* output) const { 
   output->push_back(FileDescriptorProto::kServiceFieldNumber);
   output->push_back(index());
 }
 
-void MethodDescriptor::GetLocationPath(std::vector<int>* output) const {
+void MethodDescriptor::GetLocationPath(std::vector<int>* output) const { 
   service()->GetLocationPath(output);
   output->push_back(ServiceDescriptorProto::kMethodFieldNumber);
   output->push_back(index());
@@ -3140,17 +3140,17 @@ class DescriptorBuilder {
   // As we build descriptors we store copies of the options messages in
   // them. We put pointers to those copies in this vector, as we build, so we
   // can later (after cross-linking) interpret those options.
-  std::vector<OptionsToInterpret> options_to_interpret_;
+  std::vector<OptionsToInterpret> options_to_interpret_; 
 
   bool had_errors_;
   TProtoStringType filename_;
   FileDescriptor* file_;
   FileDescriptorTables* file_tables_;
-  std::set<const FileDescriptor*> dependencies_;
+  std::set<const FileDescriptor*> dependencies_; 
 
   // unused_dependency_ is used to record the unused imported files.
   // Note: public import is not considered.
-  std::set<const FileDescriptor*> unused_dependency_;
+  std::set<const FileDescriptor*> unused_dependency_; 
 
   // If LookupSymbol() finds a symbol that is in a file which is not a declared
   // dependency of this file, it will fail, but will set
@@ -4408,7 +4408,7 @@ FileDescriptor* DescriptorBuilder::BuildFileImpl(
     result->dependencies_names_ = nullptr;
   }
   unused_dependency_.clear();
-  std::set<int> weak_deps;
+  std::set<int> weak_deps; 
   for (int i = 0; i < proto.weak_dependency_size(); ++i) {
     weak_deps.insert(proto.weak_dependency(i));
   }
@@ -4528,7 +4528,7 @@ FileDescriptor* DescriptorBuilder::BuildFileImpl(
   // extension options known, so all interpretations should now succeed.
   if (!had_errors_) {
     OptionInterpreter option_interpreter(this);
-    for (std::vector<OptionsToInterpret>::iterator iter =
+    for (std::vector<OptionsToInterpret>::iterator iter = 
              options_to_interpret_.begin();
          iter != options_to_interpret_.end(); ++iter) {
       option_interpreter.InterpretOptions(&(*iter));
@@ -6515,7 +6515,7 @@ bool DescriptorBuilder::OptionInterpreter::InterpretSingleOption(
   // name in |debug_msg_name|, for use in error messages.
   const Descriptor* descriptor = options_descriptor;
   const FieldDescriptor* field = nullptr;
-  std::vector<const FieldDescriptor*> intermediate_fields;
+  std::vector<const FieldDescriptor*> intermediate_fields; 
   TProtoStringType debug_msg_name = "";
 
   std::vector<int> dest_path = options_path;
@@ -6633,7 +6633,7 @@ bool DescriptorBuilder::OptionInterpreter::InterpretSingleOption(
 
   // Now wrap the UnknownFieldSet with UnknownFieldSets corresponding to all
   // the intermediate messages.
-  for (std::vector<const FieldDescriptor*>::reverse_iterator iter =
+  for (std::vector<const FieldDescriptor*>::reverse_iterator iter = 
            intermediate_fields.rbegin();
        iter != intermediate_fields.rend(); ++iter) {
     std::unique_ptr<UnknownFieldSet> parent_unknown_fields(
@@ -6786,7 +6786,7 @@ void DescriptorBuilder::OptionInterpreter::AddWithoutInterpreting(
 bool DescriptorBuilder::OptionInterpreter::ExamineIfOptionIsSet(
     std::vector<const FieldDescriptor*>::const_iterator
         intermediate_fields_iter,
-    std::vector<const FieldDescriptor*>::const_iterator intermediate_fields_end,
+    std::vector<const FieldDescriptor*>::const_iterator intermediate_fields_end, 
     const FieldDescriptor* innermost_field, const TProtoStringType& debug_msg_name,
     const UnknownFieldSet& unknown_fields) {
   // We do linear searches of the UnknownFieldSet and its sub-groups.  This

Разница между файлами не показана из-за своего большого размера
+ 143 - 143
contrib/libs/protobuf/src/google/protobuf/descriptor.pb.h


+ 5 - 5
contrib/libs/protobuf/src/google/protobuf/descriptor_database.cc

@@ -928,7 +928,7 @@ bool DescriptorPoolDatabase::FindAllExtensionNumbers(
   const Descriptor* extendee = pool_.FindMessageTypeByName(extendee_type);
   if (extendee == NULL) return false;
 
-  std::vector<const FieldDescriptor*> extensions;
+  std::vector<const FieldDescriptor*> extensions; 
   pool_.FindAllExtensions(extendee, &extensions);
 
   for (const FieldDescriptor* extension : extensions) {
@@ -946,7 +946,7 @@ MergedDescriptorDatabase::MergedDescriptorDatabase(
   sources_.push_back(source2);
 }
 MergedDescriptorDatabase::MergedDescriptorDatabase(
-    const std::vector<DescriptorDatabase*>& sources)
+    const std::vector<DescriptorDatabase*>& sources) 
     : sources_(sources) {}
 MergedDescriptorDatabase::~MergedDescriptorDatabase() {}
 
@@ -1006,8 +1006,8 @@ bool MergedDescriptorDatabase::FindFileContainingExtension(
 
 bool MergedDescriptorDatabase::FindAllExtensionNumbers(
     const TProtoStringType& extendee_type, std::vector<int>* output) {
-  std::set<int> merged_results;
-  std::vector<int> results;
+  std::set<int> merged_results; 
+  std::vector<int> results; 
   bool success = false;
 
   for (DescriptorDatabase* source : sources_) {
@@ -1021,7 +1021,7 @@ bool MergedDescriptorDatabase::FindAllExtensionNumbers(
   }
 
   std::copy(merged_results.begin(), merged_results.end(),
-            std::insert_iterator<std::vector<int> >(*output, output->end()));
+            std::insert_iterator<std::vector<int> >(*output, output->end())); 
 
   return success;
 }

+ 5 - 5
contrib/libs/protobuf/src/google/protobuf/descriptor_database.h

@@ -103,7 +103,7 @@ class PROTOBUF_EXPORT DescriptorDatabase {
   // This method has a default implementation that always returns
   // false.
   virtual bool FindAllExtensionNumbers(const TProtoStringType& /* extendee_type */,
-                                       std::vector<int>* /* output */) {
+                                       std::vector<int>* /* output */) { 
     return false;
   }
 
@@ -205,7 +205,7 @@ class PROTOBUF_EXPORT SimpleDescriptorDatabase : public DescriptorDatabase {
     Value FindSymbol(const TProtoStringType& name);
     Value FindExtension(const TProtoStringType& containing_type, int field_number);
     bool FindAllExtensionNumbers(const TProtoStringType& containing_type,
-                                 std::vector<int>* output);
+                                 std::vector<int>* output); 
     void FindAllFileNames(std::vector<TProtoStringType>* output);
 
    private:
@@ -318,11 +318,11 @@ class PROTOBUF_EXPORT EncodedDescriptorDatabase : public DescriptorDatabase {
   // Keep DescriptorIndex by pointer to hide the implementation to keep a
   // cleaner header.
   std::unique_ptr<DescriptorIndex> index_;
-  std::vector<void*> files_to_delete_;
+  std::vector<void*> files_to_delete_; 
 
   // If encoded_file.first is non-NULL, parse the data into *output and return
   // true, otherwise return false.
-  bool MaybeParse(std::pair<const void*, int> encoded_file,
+  bool MaybeParse(std::pair<const void*, int> encoded_file, 
                   FileDescriptorProto* output);
 
   GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(EncodedDescriptorDatabase);
@@ -379,7 +379,7 @@ class PROTOBUF_EXPORT MergedDescriptorDatabase : public DescriptorDatabase {
 
 
  private:
-  std::vector<DescriptorDatabase*> sources_;
+  std::vector<DescriptorDatabase*> sources_; 
   GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MergedDescriptorDatabase);
 };
 

+ 1 - 1
contrib/libs/protobuf/src/google/protobuf/dynamic_message.cc

@@ -567,7 +567,7 @@ DynamicMessage::~DynamicMessage() {
       switch (field->options().ctype()) {
         default:  // TODO(kenton):  Support other string reps.
         case FieldOptions::STRING: {
-          const TProtoStringType* default_value =
+          const TProtoStringType* default_value = 
               reinterpret_cast<const ArenaStringPtr*>(
                   type_info_->prototype->OffsetToPointer(
                       type_info_->offsets[i]))

+ 9 - 9
contrib/libs/protobuf/src/google/protobuf/field_mask.pb.h

@@ -188,14 +188,14 @@ class PROTOBUF_EXPORT FieldMask final :
   int _internal_paths_size() const;
   public:
   void clear_paths();
-  const TProtoStringType& paths(int index) const;
-  TProtoStringType* mutable_paths(int index);
-  void set_paths(int index, const TProtoStringType& value);
+  const TProtoStringType& paths(int index) const; 
+  TProtoStringType* mutable_paths(int index); 
+  void set_paths(int index, const TProtoStringType& value); 
   void set_paths(int index, TProtoStringType&& value);
   void set_paths(int index, const char* value);
   void set_paths(int index, const char* value, size_t size);
-  TProtoStringType* add_paths();
-  void add_paths(const TProtoStringType& value);
+  TProtoStringType* add_paths(); 
+  void add_paths(const TProtoStringType& value); 
   void add_paths(TProtoStringType&& value);
   void add_paths(const char* value);
   void add_paths(const char* value, size_t size);
@@ -246,15 +246,15 @@ inline TProtoStringType* FieldMask::add_paths() {
 inline const TProtoStringType& FieldMask::_internal_paths(int index) const {
   return paths_.Get(index);
 }
-inline const TProtoStringType& FieldMask::paths(int index) const {
+inline const TProtoStringType& FieldMask::paths(int index) const { 
   // @@protoc_insertion_point(field_get:google.protobuf.FieldMask.paths)
   return _internal_paths(index);
 }
-inline TProtoStringType* FieldMask::mutable_paths(int index) {
+inline TProtoStringType* FieldMask::mutable_paths(int index) { 
   // @@protoc_insertion_point(field_mutable:google.protobuf.FieldMask.paths)
   return paths_.Mutable(index);
 }
-inline void FieldMask::set_paths(int index, const TProtoStringType& value) {
+inline void FieldMask::set_paths(int index, const TProtoStringType& value) { 
   paths_.Mutable(index)->assign(value);
   // @@protoc_insertion_point(field_set:google.protobuf.FieldMask.paths)
 }
@@ -275,7 +275,7 @@ inline void FieldMask::set_paths(int index, const char* value, size_t size) {
 inline TProtoStringType* FieldMask::_internal_add_paths() {
   return paths_.Add();
 }
-inline void FieldMask::add_paths(const TProtoStringType& value) {
+inline void FieldMask::add_paths(const TProtoStringType& value) { 
   paths_.Add()->assign(value);
   // @@protoc_insertion_point(field_add:google.protobuf.FieldMask.paths)
 }

+ 2 - 2
contrib/libs/protobuf/src/google/protobuf/generated_message_reflection.cc

@@ -904,7 +904,7 @@ void Reflection::Swap(Message* message1, Message* message2) const {
 template <bool unsafe_shallow_swap>
 void Reflection::SwapFieldsImpl(
     Message* message1, Message* message2,
-    const std::vector<const FieldDescriptor*>& fields) const {
+    const std::vector<const FieldDescriptor*>& fields) const { 
   if (message1 == message2) return;
 
   // TODO(kenton):  Other Reflection methods should probably check this too.
@@ -1299,7 +1299,7 @@ using internal::CreateUnknownEnumValues;
 
 void Reflection::ListFieldsMayFailOnStripped(
     const Message& message, bool should_fail,
-    std::vector<const FieldDescriptor*>* output) const {
+    std::vector<const FieldDescriptor*>* output) const { 
   output->clear();
 
   // Optimization:  The default instance never has any fields set.

Некоторые файлы не были показаны из-за большого количества измененных файлов