diff options
author | Jisi Liu <jisi.liu@gmail.com> | 2015-02-28 14:51:22 -0800 |
---|---|---|
committer | Jisi Liu <jisi.liu@gmail.com> | 2015-02-28 17:06:49 -0800 |
commit | 885b612f74f133678bf82808c589331e4c59dad9 (patch) | |
tree | e5f3f65b41af477c52810053b8694896c8bcd1f7 /src/google/protobuf/message.cc | |
parent | 1939efed2db35020b7830a4927f10feac47b6757 (diff) | |
download | protobuf-885b612f74f133678bf82808c589331e4c59dad9.tar.gz protobuf-885b612f74f133678bf82808c589331e4c59dad9.tar.bz2 protobuf-885b612f74f133678bf82808c589331e4c59dad9.zip |
Down integrate from Google internal branch for C++ and Java.
- Maps for C++ lite
- C++ Arena optimizations.
- Java Lite runtime code size optimization.
Change-Id: I7537a4357c1cb385d23f9e8aa7ffdfeefe079f13
Diffstat (limited to 'src/google/protobuf/message.cc')
-rw-r--r-- | src/google/protobuf/message.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/google/protobuf/message.cc b/src/google/protobuf/message.cc index 28955b35..f58be848 100644 --- a/src/google/protobuf/message.cc +++ b/src/google/protobuf/message.cc @@ -443,17 +443,17 @@ const internal::RepeatedFieldAccessor* Reflection::RepeatedFieldAccessor( namespace internal { namespace { void ShutdownRepeatedFieldAccessor() { - Singleton<internal::RepeatedFieldPrimitiveAccessor<int32> >::ShutDown(); - Singleton<internal::RepeatedFieldPrimitiveAccessor<uint32> >::ShutDown(); - Singleton<internal::RepeatedFieldPrimitiveAccessor<int64> >::ShutDown(); - Singleton<internal::RepeatedFieldPrimitiveAccessor<uint64> >::ShutDown(); - Singleton<internal::RepeatedFieldPrimitiveAccessor<float> >::ShutDown(); - Singleton<internal::RepeatedFieldPrimitiveAccessor<double> >::ShutDown(); - Singleton<internal::RepeatedFieldPrimitiveAccessor<bool> >::ShutDown(); - Singleton<internal::RepeatedPtrFieldStringAccessor>::ShutDown(); - Singleton<internal::RepeatedPtrFieldMessageAccessor>::ShutDown(); - Singleton<internal::MapFieldAccessor>::ShutDown(); -}; + internal::Singleton<internal::RepeatedFieldPrimitiveAccessor<int32> >::ShutDown(); + internal::Singleton<internal::RepeatedFieldPrimitiveAccessor<uint32> >::ShutDown(); + internal::Singleton<internal::RepeatedFieldPrimitiveAccessor<int64> >::ShutDown(); + internal::Singleton<internal::RepeatedFieldPrimitiveAccessor<uint64> >::ShutDown(); + internal::Singleton<internal::RepeatedFieldPrimitiveAccessor<float> >::ShutDown(); + internal::Singleton<internal::RepeatedFieldPrimitiveAccessor<double> >::ShutDown(); + internal::Singleton<internal::RepeatedFieldPrimitiveAccessor<bool> >::ShutDown(); + internal::Singleton<internal::RepeatedPtrFieldStringAccessor>::ShutDown(); + internal::Singleton<internal::RepeatedPtrFieldMessageAccessor>::ShutDown(); + internal::Singleton<internal::MapFieldAccessor>::ShutDown(); +} struct ShutdownRepeatedFieldRegister { ShutdownRepeatedFieldRegister() { @@ -461,7 +461,7 @@ struct ShutdownRepeatedFieldRegister { } } shutdown_; -} // namesapce +} // namespace } // namespace internal namespace internal { |