aboutsummaryrefslogtreecommitdiffhomepage
path: root/conformance/conformance_test.h
diff options
context:
space:
mode:
authorGravatar Yilun Chong <yilunchong@google.com>2017-06-29 14:40:47 -0700
committerGravatar Yilun Chong <yilunchong@google.com>2017-06-29 14:40:47 -0700
commitfcb926825537c214ef7ce40f742aca905345f958 (patch)
treeb0c072fa50a69e696179b03016c3d2bd105d7e2d /conformance/conformance_test.h
parent020a24dfdc2de06678f3f7f3547ba748fb5e5d42 (diff)
change java to uniform message, revert TestValidDataForType's parameters
Diffstat (limited to 'conformance/conformance_test.h')
-rw-r--r--conformance/conformance_test.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/conformance/conformance_test.h b/conformance/conformance_test.h
index 6bfcd72f..3e3ac6eb 100644
--- a/conformance/conformance_test.h
+++ b/conformance/conformance_test.h
@@ -210,8 +210,7 @@ class ConformanceTestSuite {
void TestIllegalTags();
void TestValidDataForType(
google::protobuf::FieldDescriptor::Type,
- std::vector<std::pair<std::string, std::string>> values,
- bool isProto3);
+ std::vector<std::pair<std::string, std::string>> values);
bool CheckSetEmpty(const set<string>& set_to_check,
const std::string& write_to_file, const std::string& msg);
ConformanceTestRunner* runner_;