diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2018-07-13 16:55:32 -0700 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2018-07-15 16:41:25 -0700 |
| commit | 9de4e64cf2b10f2ef45d811fc1733b4bec8948fa (patch) | |
| tree | 4b208bad5bc662fa57f41413dd4aa81b92e7b01b /src | |
| parent | 78944e14035efd2688c70e460e4fee9a0764888d (diff) | |
| download | protobuf-9de4e64cf2b10f2ef45d811fc1733b4bec8948fa.tar.gz protobuf-9de4e64cf2b10f2ef45d811fc1733b4bec8948fa.tar.bz2 protobuf-9de4e64cf2b10f2ef45d811fc1733b4bec8948fa.zip | |
Add cpp tests under release docker image.
1. Added C++ tests under the release docker image.
2. Fixed a compile issue with the docker image.
3. Cleaned up tests.sh and removed traivis stuff.
Diffstat (limited to 'src')
| -rw-r--r-- | src/google/protobuf/map_entry.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/google/protobuf/map_entry.h b/src/google/protobuf/map_entry.h index f25b5834..f170f97b 100644 --- a/src/google/protobuf/map_entry.h +++ b/src/google/protobuf/map_entry.h @@ -95,12 +95,12 @@ class MapEntry typedef void InternalArenaConstructable_; typedef void DestructorSkippable_; - using typename MapEntryImpl<Derived, Message, Key, Value, kKeyFieldType, - kValueFieldType, - default_enum_value>::KeyTypeHandler; - using typename MapEntryImpl<Derived, Message, Key, Value, kKeyFieldType, - kValueFieldType, - default_enum_value>::ValueTypeHandler; + typedef typename MapEntryImpl< + Derived, Message, Key, Value, kKeyFieldType, kValueFieldType, + default_enum_value>::KeyTypeHandler KeyTypeHandler; + typedef typename MapEntryImpl< + Derived, Message, Key, Value, kKeyFieldType, kValueFieldType, + default_enum_value>::ValueTypeHandler ValueTypeHandler; size_t SpaceUsedLong() const override { size_t size = sizeof(Derived); size += KeyTypeHandler::SpaceUsedInMapEntryLong(this->key_); |