diff options
| author |  Adam Cozzette <acozzette@gmail.com> | 2017-09-18 08:34:54 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-09-18 08:34:54 -0700 |
| commit | fa5a69e73b0dd667ff15062adbc170310d440ee9 (patch) | |
| tree | c219e7eb18b82523e36c6748861c403a14ea66ae /conformance | |
| parent | d1bc27caef8377a710370189675cb0958443e8f1 (diff) | |
| parent | 13fd045dbb2b4dacea32be162a41d5a4b0d1802f (diff) | |
Merge pull request #3624 from acozzette/down-integrate
Integrated internal changes from Google
Diffstat (limited to 'conformance')
| -rw-r--r-- | conformance/conformance_cpp.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/conformance/conformance_cpp.cc b/conformance/conformance_cpp.cc index bf70309a..9540b50e 100644 --- a/conformance/conformance_cpp.cc +++ b/conformance/conformance_cpp.cc @@ -52,6 +52,7 @@ using google::protobuf::util::NewTypeResolverForDescriptorPool; using google::protobuf::util::Status; using google::protobuf::util::TypeResolver; using protobuf_test_messages::proto3::TestAllTypesProto3; +using protobuf_test_messages::proto2::TestAllTypesProto2; using std::string; static const char kTypeUrlPrefix[] = "type.googleapis.com"; |