diff options
| author |  Adam Cozzette <acozzette@google.com> | 2016-06-29 15:23:27 -0700 |
|---|---|---|
| committer | Adam Cozzette <acozzette@google.com> | 2016-06-29 15:38:03 -0700 |
| commit | d64a2d9941c36a7bc2a7959ea10ab8363192ac14 (patch) | |
| tree | 52330d146ad63d3d70f3baade00d5d1fea8f5e0c /src/google/protobuf/dynamic_message_unittest.cc | |
| parent | c18aa7795a2e02ef700ff8b039d94ecdcc33432f (diff) | |
Integrated internal changes from Google
This includes all internal changes from around May 20 to now.
Diffstat (limited to 'src/google/protobuf/dynamic_message_unittest.cc')
| -rw-r--r-- | src/google/protobuf/dynamic_message_unittest.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/google/protobuf/dynamic_message_unittest.cc b/src/google/protobuf/dynamic_message_unittest.cc index 70e437d7..fe51d8cf 100644 --- a/src/google/protobuf/dynamic_message_unittest.cc +++ b/src/google/protobuf/dynamic_message_unittest.cc @@ -45,8 +45,6 @@ #include <google/protobuf/stubs/shared_ptr.h> #endif -#include <google/protobuf/stubs/scoped_ptr.h> -#include <google/protobuf/stubs/common.h> #include <google/protobuf/dynamic_message.h> #include <google/protobuf/descriptor.h> #include <google/protobuf/descriptor.pb.h> @@ -55,6 +53,7 @@ #include <google/protobuf/unittest_no_field_presence.pb.h> #include <google/protobuf/stubs/logging.h> +#include <google/protobuf/stubs/common.h> #include <google/protobuf/testing/googletest.h> #include <gtest/gtest.h> |