aboutsummaryrefslogtreecommitdiff
path: root/conformance/conformance_test.h
diff options
context:
space:
mode:
authorAdam Cozzette <acozzette@google.com>2017-04-27 14:55:53 -0700
committerAdam Cozzette <acozzette@google.com>2017-04-27 14:55:53 -0700
commit9053033a5076f82cf18b823c31f352e95e5bfd8d (patch)
tree1d2a2611f56e786d7c3e40b8fd1b2e3d9aff9025 /conformance/conformance_test.h
parent067b1eec3bf852abaad0844999461baff8a5fdc8 (diff)
parenta6189acd18b00611c1dc7042299ad75486f08a1a (diff)
downloadprotobuf-9053033a5076f82cf18b823c31f352e95e5bfd8d.tar.gz
protobuf-9053033a5076f82cf18b823c31f352e95e5bfd8d.tar.bz2
protobuf-9053033a5076f82cf18b823c31f352e95e5bfd8d.zip
Merge remote-tracking branch 'remotes/google/3.3.x' into merge-3.3-to-master
Diffstat (limited to 'conformance/conformance_test.h')
-rw-r--r--conformance/conformance_test.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/conformance/conformance_test.h b/conformance/conformance_test.h
index 5f05a25b..4e40a6ac 100644
--- a/conformance/conformance_test.h
+++ b/conformance/conformance_test.h
@@ -201,6 +201,7 @@ class ConformanceTestSuite {
const std::string& test_name,
ConformanceLevel level);
void TestPrematureEOFForType(google::protobuf::FieldDescriptor::Type type);
+ void TestIllegalTags();
void TestValidDataForType(
google::protobuf::FieldDescriptor::Type,
std::vector<std::pair<std::string, std::string>> values);