diff options
-rw-r--r-- | Makefile.am | 1 | ||||
-rw-r--r-- | python/google/protobuf/internal/import_test_package/BUILD | 27 | ||||
-rw-r--r-- | src/google/protobuf/compiler/cpp/cpp_service.cc | 2 |
3 files changed, 1 insertions, 29 deletions
diff --git a/Makefile.am b/Makefile.am index 1e11e371..95316eb5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -195,7 +195,6 @@ python_EXTRA_DIST= \ python/google/protobuf/internal/wire_format.py \ python/google/protobuf/internal/wire_format_test.py \ python/google/protobuf/internal/__init__.py \ - python/google/protobuf/internal/import_test_package/BUILD \ python/google/protobuf/internal/import_test_package/__init__.py \ python/google/protobuf/internal/import_test_package/inner.proto \ python/google/protobuf/internal/import_test_package/outer.proto \ diff --git a/python/google/protobuf/internal/import_test_package/BUILD b/python/google/protobuf/internal/import_test_package/BUILD deleted file mode 100644 index 90e59505..00000000 --- a/python/google/protobuf/internal/import_test_package/BUILD +++ /dev/null @@ -1,27 +0,0 @@ -# Description: -# An example package that contains nested protos that are imported from -# __init__.py. See testPackageInitializationImport in reflection_test.py for -# details. - -package( - default_visibility = ["//net/proto2/python/internal:__pkg__"], -) - -proto_library( - name = "inner_proto", - srcs = ["inner.proto"], - py_api_version = 2, -) - -proto_library( - name = "outer_proto", - srcs = ["outer.proto"], - py_api_version = 2, - deps = [":inner_proto"], -) - -py_library( - name = "import_test_package", - srcs = ["__init__.py"], - deps = [":outer_proto"], -) 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"); |