diff options
| author |  liujisi@google.com <liujisi@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2011-04-08 03:40:29 +0000 |
|---|---|---|
| committer | liujisi@google.com <liujisi@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2011-04-08 03:40:29 +0000 |
| commit | 9cf65b7dd29adfb849b555eee3e3b93d7c45fc73 (patch) | |
| tree | 745bb0ccdab975170c144651eb91d6cd0a3b976d /java | |
| parent | eab9b5d47faf6c9611be323f4354f9548f6e378a (diff) | |
Use fully qualified java.lang.Object in protoc java code.
Diffstat (limited to 'java')
| -rw-r--r-- | java/src/test/java/com/google/protobuf/test_bad_identifiers.proto | 6 |
1 files changed, 5 insertions, 1 deletions
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 { |