From 9cf65b7dd29adfb849b555eee3e3b93d7c45fc73 Mon Sep 17 00:00:00 2001 From: "liujisi@google.com" Date: Fri, 8 Apr 2011 03:40:29 +0000 Subject: Use fully qualified java.lang.Object in protoc java code. --- java/src/test/java/com/google/protobuf/test_bad_identifiers.proto | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'java') diff --git a/java/src/test/java/com/google/protobuf/test_bad_identifiers.proto b/java/src/test/java/com/google/protobuf/test_bad_identifiers.proto index 5cc42af8..499f099f 100644 --- a/java/src/test/java/com/google/protobuf/test_bad_identifiers.proto +++ b/java/src/test/java/com/google/protobuf/test_bad_identifiers.proto @@ -57,7 +57,11 @@ message Deprecated { } message Override { - optional int32 override = 1; + optional int32 override = 1; +} + +message Object { + optional int32 object = 1; } service TestConflictingMethodNames { -- cgit v1.2.3