diff options
author | Feng Xiao <xfxyjwf@gmail.com> | 2018-08-08 17:00:41 -0700 |
---|---|---|
committer | Feng Xiao <xfxyjwf@gmail.com> | 2018-08-08 17:00:41 -0700 |
commit | 6bbe197e9c1b6fc38cbdc45e3bf83fa7ced792a3 (patch) | |
tree | e575738adf52d24b883cca5e8928a5ded31caba1 /src/google/protobuf/map_field_test.cc | |
parent | e7746f487cb9cca685ffb1b3d7dccc5554b618a4 (diff) | |
download | protobuf-6bbe197e9c1b6fc38cbdc45e3bf83fa7ced792a3.tar.gz protobuf-6bbe197e9c1b6fc38cbdc45e3bf83fa7ced792a3.tar.bz2 protobuf-6bbe197e9c1b6fc38cbdc45e3bf83fa7ced792a3.zip |
Down-integrate from google3.
Diffstat (limited to 'src/google/protobuf/map_field_test.cc')
-rw-r--r-- | src/google/protobuf/map_field_test.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/google/protobuf/map_field_test.cc b/src/google/protobuf/map_field_test.cc index f58d59e5..dcfcca76 100644 --- a/src/google/protobuf/map_field_test.cc +++ b/src/google/protobuf/map_field_test.cc @@ -30,22 +30,23 @@ #include <map> #include <memory> +#include <unordered_map> #include <google/protobuf/stubs/logging.h> #include <google/protobuf/stubs/common.h> -#include <google/protobuf/arena.h> -#include <google/protobuf/map.h> #include <google/protobuf/arena_test_util.h> -#include <google/protobuf/map_unittest.pb.h> #include <google/protobuf/map_test_util.h> +#include <google/protobuf/map_unittest.pb.h> #include <google/protobuf/unittest.pb.h> +#include <google/protobuf/arena.h> +#include <google/protobuf/map.h> #include <google/protobuf/map_field_inl.h> #include <google/protobuf/message.h> #include <google/protobuf/repeated_field.h> #include <google/protobuf/wire_format_lite_inl.h> #include <gtest/gtest.h> -namespace google { +namespace google { namespace protobuf { namespace internal { @@ -95,6 +96,7 @@ class MapFieldBaseStub : public MapFieldBase { int size() const { return 0; } void MapBegin(MapIterator* map_iter) const {} void MapEnd(MapIterator* map_iter) const {} + void Swap(MapFieldBase* other) {} void InitializeIterator(MapIterator* map_iter) const {} void DeleteIterator(MapIterator* map_iter) const {} void CopyIterator(MapIterator* this_iterator, |