diff options
| author |  Joshua Haberman <jhaberman@gmail.com> | 2016-12-03 11:51:25 -0500 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-12-03 11:51:25 -0500 |
| commit | f1ce60e7b45c16affa4c8a92a9a129755c5fcfd5 (patch) | |
| tree | b71a425660fc225154547f542ff1dbe0e342ade3 /conformance/conformance_cpp.cc | |
| parent | 4280c2740300f414d95a5f282426f25f5b13e05d (diff) | |
Factored Conformance and Benchmark test messages into shared test schema. (#1971)
* Factored Conformance test messages into shared test schema.
* Updated benchmarks to use new proto3 message locations.
* Fixed include path.
* Conformance: fixed include of Python test messages.
* Make maven in Rakefile use --batch-mode.
* Revert changes to benchmarks.
On second thought I think a separate schema for
CPU benchmarking makes sense.
* Try regenerating C# protos for new test protos.
* Removed benchmark messages from test proto.
* Added Jon Skeet's fixes for C#.
* Removed duplicate/old test messages C# file.
* C# fixes for test schema move.
* Fixed C# to use the correct TestAllTypes message.
* Fixes for Objective C test schema move.
* Added missing EXTRA_DIST file.
Diffstat (limited to 'conformance/conformance_cpp.cc')
| -rw-r--r-- | conformance/conformance_cpp.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/conformance/conformance_cpp.cc b/conformance/conformance_cpp.cc index 1a265493..df3f2acd 100644 --- a/conformance/conformance_cpp.cc +++ b/conformance/conformance_cpp.cc @@ -33,12 +33,12 @@ #include <unistd.h> #include "conformance.pb.h" +#include "google/protobuf/test_messages_proto3.pb.h" #include <google/protobuf/util/json_util.h> #include <google/protobuf/util/type_resolver_util.h> using conformance::ConformanceRequest; using conformance::ConformanceResponse; -using conformance::TestAllTypes; using google::protobuf::Descriptor; using google::protobuf::DescriptorPool; using google::protobuf::internal::scoped_ptr; @@ -47,6 +47,7 @@ using google::protobuf::util::JsonToBinaryString; using google::protobuf::util::NewTypeResolverForDescriptorPool; using google::protobuf::util::Status; using google::protobuf::util::TypeResolver; +using protobuf_test_messages::proto3::TestAllTypes; using std::string; static const char kTypeUrlPrefix[] = "type.googleapis.com"; |