diff options
| author | Brian Duff <bduff@google.com> | 2014-07-22 13:34:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-22 13:34:40 +0000 |
| commit | f9b409e35963a357985ee687d096f8c166e0b80e (patch) | |
| tree | 9692764ef6648b37fa43762477fd01fa23dca8a4 | |
| parent | 60b72a8ef366b27110e8a70caacb2fcd97e1ce92 (diff) | |
| parent | 95d99df4574c28debcf9646056a0350ff44bc7c9 (diff) | |
| download | external_protobuf-f9b409e35963a357985ee687d096f8c166e0b80e.zip external_protobuf-f9b409e35963a357985ee687d096f8c166e0b80e.tar.gz external_protobuf-f9b409e35963a357985ee687d096f8c166e0b80e.tar.bz2 | |
am 95d99df4: Merge "Don\'t return NULL from {Boxed}PrimitiveTypeName."
* commit '95d99df4574c28debcf9646056a0350ff44bc7c9':
Don't return NULL from {Boxed}PrimitiveTypeName.
| -rw-r--r-- | src/google/protobuf/compiler/javanano/javanano_helpers.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/google/protobuf/compiler/javanano/javanano_helpers.cc b/src/google/protobuf/compiler/javanano/javanano_helpers.cc index e8326a4..bf88f25 100644 --- a/src/google/protobuf/compiler/javanano/javanano_helpers.cc +++ b/src/google/protobuf/compiler/javanano/javanano_helpers.cc @@ -336,14 +336,14 @@ string PrimitiveTypeName(JavaType type) { case JAVATYPE_STRING : return "java.lang.String"; case JAVATYPE_BYTES : return "byte[]"; case JAVATYPE_ENUM : return "int"; - case JAVATYPE_MESSAGE: return NULL; + case JAVATYPE_MESSAGE: return ""; // No default because we want the compiler to complain if any new // JavaTypes are added. } GOOGLE_LOG(FATAL) << "Can't get here."; - return NULL; + return ""; } string BoxedPrimitiveTypeName(JavaType type) { @@ -356,14 +356,14 @@ string BoxedPrimitiveTypeName(JavaType type) { case JAVATYPE_STRING : return "java.lang.String"; case JAVATYPE_BYTES : return "byte[]"; case JAVATYPE_ENUM : return "java.lang.Integer"; - case JAVATYPE_MESSAGE: return NULL; + case JAVATYPE_MESSAGE: return ""; // No default because we want the compiler to complain if any new // JavaTypes are added. } GOOGLE_LOG(FATAL) << "Can't get here."; - return NULL; + return ""; } string EmptyArrayName(const Params& params, const FieldDescriptor* field) { |