diff options
Diffstat (limited to 'src/google/protobuf/descriptor_database.h')
-rw-r--r-- | src/google/protobuf/descriptor_database.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/google/protobuf/descriptor_database.h b/src/google/protobuf/descriptor_database.h index f32b1db..934e402 100644 --- a/src/google/protobuf/descriptor_database.h +++ b/src/google/protobuf/descriptor_database.h @@ -1,6 +1,6 @@ // Protocol Buffers - Google's data interchange format // Copyright 2008 Google Inc. All rights reserved. -// http://code.google.com/p/protobuf/ +// https://developers.google.com/protocol-buffers/ // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are @@ -41,6 +41,7 @@ #include <string> #include <utility> #include <vector> +#include <google/protobuf/stubs/common.h> #include <google/protobuf/descriptor.h> namespace google { @@ -95,11 +96,12 @@ class LIBPROTOBUF_EXPORT DescriptorDatabase { // // This method has a default implementation that always returns // false. - virtual bool FindAllExtensionNumbers(const string& extendee_type, - vector<int>* output) { + virtual bool FindAllExtensionNumbers(const string& /* extendee_type */, + vector<int>* /* output */) { return false; } + private: GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(DescriptorDatabase); }; @@ -355,6 +357,7 @@ class LIBPROTOBUF_EXPORT MergedDescriptorDatabase : public DescriptorDatabase { bool FindAllExtensionNumbers(const string& extendee_type, vector<int>* output); + private: vector<DescriptorDatabase*> sources_; GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MergedDescriptorDatabase); |