diff options
| author |  Feng Xiao <xfxyjwf@gmail.com> | 2014-11-14 11:50:31 -0800 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2014-11-14 11:50:31 -0800 |
| commit | f157a5651c79a7a36e242af216a5d5b383ba8af2 (patch) | |
| tree | 368bb0ca0e89ab7514302e4df00435a4ef461a28 /src/google/protobuf/dynamic_message.h | |
| parent | faf581d20866ad5e586b3e515f6c547d2dcec2c1 (diff) | |
Down-integrate from internal code base (C++ maps support).
Diffstat (limited to 'src/google/protobuf/dynamic_message.h')
| -rw-r--r-- | src/google/protobuf/dynamic_message.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/dynamic_message.h b/src/google/protobuf/dynamic_message.h index 1e947e6d..b5928a52 100644 --- a/src/google/protobuf/dynamic_message.h +++ b/src/google/protobuf/dynamic_message.h @@ -126,7 +126,7 @@ class LIBPROTOBUF_EXPORT DynamicMessageFactory : public MessageFactory { // public header (for good reason), but dynamic_message.h is, and public // headers may only #include other public headers. struct PrototypeMap; - scoped_ptr<PrototypeMap> prototypes_; + google::protobuf::scoped_ptr<PrototypeMap> prototypes_; mutable Mutex prototypes_mutex_; friend class DynamicMessage; |