| Index: third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_service.cc
|
| diff --git a/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_service.cc b/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_service.cc
|
| index 226c2aa03b8094dfba184d3ccc750da8e76f91ef..d20018ea212f230d2ed1ea6cab67a0eab0de2783 100644
|
| --- a/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_service.cc
|
| +++ b/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_service.cc
|
| @@ -1,6 +1,6 @@
|
| // Protocol Buffers - Google's data interchange format
|
| // Copyright 2008 Google Inc. All rights reserved.
|
| -// https://developers.google.com/protocol-buffers/
|
| +// http://code.google.com/p/protobuf/
|
| //
|
| // Redistribution and use in source and binary forms, with or without
|
| // modification, are permitted provided that the following conditions are
|
| @@ -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 *static_cast< ::google::protobuf::Message*>(NULL);\n"
|
| + " return *reinterpret_cast< ::google::protobuf::Message*>(NULL);\n"
|
| " }\n"
|
| "}\n"
|
| "\n");
|
|
|