diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/google/protobuf/descriptor_database_unittest.cc | 2 | ||||
| -rw-r--r-- | src/google/protobuf/extension_set.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/google/protobuf/descriptor_database_unittest.cc b/src/google/protobuf/descriptor_database_unittest.cc index 64ec551a..33de1348 100644 --- a/src/google/protobuf/descriptor_database_unittest.cc +++ b/src/google/protobuf/descriptor_database_unittest.cc @@ -34,6 +34,8 @@ // // This file makes extensive use of RFC 3092. :) +#include <algorithm> + #include <google/protobuf/descriptor_database.h> #include <google/protobuf/descriptor.h> #include <google/protobuf/descriptor.pb.h> diff --git a/src/google/protobuf/extension_set.h b/src/google/protobuf/extension_set.h index 8e64b9bd..c23dc2b0 100644 --- a/src/google/protobuf/extension_set.h +++ b/src/google/protobuf/extension_set.h @@ -633,7 +633,7 @@ class LIBPROTOBUF_EXPORT ExtensionIdentifier { private: const int number_; - const typename TypeTraits::ConstType default_value_; + typename TypeTraits::ConstType default_value_; }; // ------------------------------------------------------------------- |