diff options
| author | Brian Duff <bduff@google.com> | 2014-07-21 14:31:07 -0700 |
|---|---|---|
| committer | Brian Duff <bduff@google.com> | 2014-07-21 14:31:07 -0700 |
| commit | ba13794999073dd15f7e3ed3bfb87ddac477e19b (patch) | |
| tree | 9692764ef6648b37fa43762477fd01fa23dca8a4 /src | |
| parent | 11607eb10bcf3a46e92257966949d48b28bb7bf3 (diff) | |
| download | external_protobuf-ba13794999073dd15f7e3ed3bfb87ddac477e19b.zip external_protobuf-ba13794999073dd15f7e3ed3bfb87ddac477e19b.tar.gz external_protobuf-ba13794999073dd15f7e3ed3bfb87ddac477e19b.tar.bz2 | |
Don't return NULL from {Boxed}PrimitiveTypeName.
The behavior of the string ctor is undefined when you pass NULL. This
is checked strictly in C++11, so fails to compile.
Change-Id: Id5e0984ad1d37f2d504f7c42ac23e52ed4a58903
Diffstat (limited to 'src')
| -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) { |