diff options
author | xiaofeng@google.com <xiaofeng@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2013-02-07 07:00:07 +0000 |
---|---|---|
committer | xiaofeng@google.com <xiaofeng@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2013-02-07 07:00:07 +0000 |
commit | e406747cd50270855c75902bb3a6de2e7659763d (patch) | |
tree | 7d7de84eda20b176bc9dfe143f24171005f26ee5 /src | |
parent | 1e5a5e84193575c63126b0e90a2707378a8015ec (diff) | |
download | protobuf-e406747cd50270855c75902bb3a6de2e7659763d.tar.gz protobuf-e406747cd50270855c75902bb3a6de2e7659763d.tar.bz2 protobuf-e406747cd50270855c75902bb3a6de2e7659763d.zip |
Fix issue 445, issue 449
Diffstat (limited to 'src')
-rw-r--r-- | src/google/protobuf/extension_set.h | 2 | ||||
-rw-r--r-- | src/google/protobuf/message.cc | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/google/protobuf/extension_set.h b/src/google/protobuf/extension_set.h index 03af7eaf..df8f1f36 100644 --- a/src/google/protobuf/extension_set.h +++ b/src/google/protobuf/extension_set.h @@ -551,7 +551,7 @@ class LIBPROTOBUF_EXPORT ExtensionSet { // only contain a small number of extensions whereas hash_map is optimized // for 100 elements or more. Also, we want AppendToList() to order fields // by field number. - map<int, Extension> extensions_; + std::map<int, Extension> extensions_; GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ExtensionSet); }; diff --git a/src/google/protobuf/message.cc b/src/google/protobuf/message.cc index 6119d26a..b3f8024c 100644 --- a/src/google/protobuf/message.cc +++ b/src/google/protobuf/message.cc @@ -32,6 +32,7 @@ // Based on original Protocol Buffers design by // Sanjay Ghemawat, Jeff Dean, and others. +#include <iostream> #include <stack> #include <google/protobuf/stubs/hash.h> |