From fcb926825537c214ef7ce40f742aca905345f958 Mon Sep 17 00:00:00 2001
From: Yilun Chong <yilunchong@google.com>
Date: Thu, 29 Jun 2017 14:40:47 -0700
Subject: change java to uniform message, revert TestValidDataForType's
 parameters

---
 conformance/conformance_test.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'conformance/conformance_test.h')

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_;
-- 
cgit v1.2.3