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/io/zero_copy_stream_impl_lite.h | |
| 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/io/zero_copy_stream_impl_lite.h')
| -rw-r--r-- | src/google/protobuf/io/zero_copy_stream_impl_lite.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/io/zero_copy_stream_impl_lite.h b/src/google/protobuf/io/zero_copy_stream_impl_lite.h index 3e25edfa..4360b18f 100644 --- a/src/google/protobuf/io/zero_copy_stream_impl_lite.h +++ b/src/google/protobuf/io/zero_copy_stream_impl_lite.h @@ -368,7 +368,7 @@ inline char* mutable_string_data(string* s) { inline std::pair<char*, bool> as_string_data(string* s) { char *p = mutable_string_data(s); #ifdef LANG_CXX11 - return make_pair(p, true); + return std::make_pair(p, true); #else return make_pair(p, p != NULL); #endif |