aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFeng Xiao <xfxyjwf@gmail.com>2015-01-27 15:31:54 -0800
committerFeng Xiao <xfxyjwf@gmail.com>2015-01-27 15:31:54 -0800
commit76cb776d9407b1225a70b5c3f8b2d9bb5ffd4e9a (patch)
tree27e33572b9cf9704593e13ed876258b9727c328f
parentae11803d771aa5d1989f58be927d07af994ddd5f (diff)
parentf01c1441bc7226bf10cf032b2b699a151020cd14 (diff)
downloadprotobuf-76cb776d9407b1225a70b5c3f8b2d9bb5ffd4e9a.tar.gz
protobuf-76cb776d9407b1225a70b5c3f8b2d9bb5ffd4e9a.tar.bz2
protobuf-76cb776d9407b1225a70b5c3f8b2d9bb5ffd4e9a.zip
Merge pull request #180 from ned14/master
Fix illegal C++ use of reinterpret_cast<> to cast between nullptr_t and a pointer
-rw-r--r--src/google/protobuf/compiler/cpp/cpp_service.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/compiler/cpp/cpp_service.cc b/src/google/protobuf/compiler/cpp/cpp_service.cc
index a8f303da..226c2aa0 100644
--- a/src/google/protobuf/compiler/cpp/cpp_service.cc
+++ b/src/google/protobuf/compiler/cpp/cpp_service.cc
@@ -301,7 +301,7 @@ void ServiceGenerator::GenerateGetPrototype(RequestOrResponse which,
printer->Print(vars_,
" default:\n"
" GOOGLE_LOG(FATAL) << \"Bad method index; this should never happen.\";\n"
- " return *reinterpret_cast< ::google::protobuf::Message*>(NULL);\n"
+ " return *static_cast< ::google::protobuf::Message*>(NULL);\n"
" }\n"
"}\n"
"\n");