From c713a11982ed359c39384ff437f8c62ef2bf990f Mon Sep 17 00:00:00 2001 From: Karthik Ravi Shankar Date: Fri, 18 Sep 2020 11:34:39 -0700 Subject: [PATCH 1/3] Delete some files from previous PR Some files were left off from https://github.com/grpc/grpc/pull/24082 This PR completes the cleanup. --- include/grpcpp/support/async_stream_impl.h | 24 ------------------- .../grpcpp/support/async_unary_call_impl.h | 24 ------------------- include/grpcpp/support/client_callback_impl.h | 24 ------------------- include/grpcpp/support/server_callback_impl.h | 24 ------------------- include/grpcpp/support/sync_stream_impl.h | 24 ------------------- 5 files changed, 120 deletions(-) delete mode 100644 include/grpcpp/support/async_stream_impl.h delete mode 100644 include/grpcpp/support/async_unary_call_impl.h delete mode 100644 include/grpcpp/support/client_callback_impl.h delete mode 100644 include/grpcpp/support/server_callback_impl.h delete mode 100644 include/grpcpp/support/sync_stream_impl.h diff --git a/include/grpcpp/support/async_stream_impl.h b/include/grpcpp/support/async_stream_impl.h deleted file mode 100644 index cff700d3fa9..00000000000 --- a/include/grpcpp/support/async_stream_impl.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * - * Copyright 2019 gRPC authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#ifndef GRPCPP_SUPPORT_ASYNC_STREAM_IMPL_H -#define GRPCPP_SUPPORT_ASYNC_STREAM_IMPL_H - -#include - -#endif // GRPCPP_SUPPORT_ASYNC_STREAM_IMPL_H diff --git a/include/grpcpp/support/async_unary_call_impl.h b/include/grpcpp/support/async_unary_call_impl.h deleted file mode 100644 index 488fe87515a..00000000000 --- a/include/grpcpp/support/async_unary_call_impl.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * - * Copyright 2019 gRPC authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#ifndef GRPCPP_SUPPORT_ASYNC_UNARY_CALL_IMPL_H -#define GRPCPP_SUPPORT_ASYNC_UNARY_CALL_IMPL_H - -#include - -#endif // GRPCPP_SUPPORT_ASYNC_UNARY_CALL_IMPL_H diff --git a/include/grpcpp/support/client_callback_impl.h b/include/grpcpp/support/client_callback_impl.h deleted file mode 100644 index ed8df412496..00000000000 --- a/include/grpcpp/support/client_callback_impl.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * - * Copyright 2019 gRPC authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#ifndef GRPCPP_SUPPORT_CLIENT_CALLBACK_IMPL_H -#define GRPCPP_SUPPORT_CLIENT_CALLBACK_IMPL_H - -#include - -#endif // GRPCPP_SUPPORT_CLIENT_CALLBACK_IMPL_H diff --git a/include/grpcpp/support/server_callback_impl.h b/include/grpcpp/support/server_callback_impl.h deleted file mode 100644 index a91c8141dd8..00000000000 --- a/include/grpcpp/support/server_callback_impl.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * - * Copyright 2019 gRPC authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#ifndef GRPCPP_SUPPORT_SERVER_CALLBACK_IMPL_H -#define GRPCPP_SUPPORT_SERVER_CALLBACK_IMPL_H - -#include - -#endif // GRPCPP_SUPPORT_SERVER_CALLBACK_IMPL_H diff --git a/include/grpcpp/support/sync_stream_impl.h b/include/grpcpp/support/sync_stream_impl.h deleted file mode 100644 index a00e425acfc..00000000000 --- a/include/grpcpp/support/sync_stream_impl.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * - * Copyright 2019 gRPC authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#ifndef GRPCPP_SUPPORT_SYNC_STREAM_IMPL_H -#define GRPCPP_SUPPORT_SYNC_STREAM_IMPL_H - -#include - -#endif // GRPCPP_SUPPORT_SYNC_STREAM_IMPL_H From 083920062367ebf5b87d0e34bd0ee14916b01979 Mon Sep 17 00:00:00 2001 From: Karthik Ravi Shankar Date: Fri, 18 Sep 2020 11:45:38 -0700 Subject: [PATCH 2/3] Fix the method_handler_impl public header This header is pointing to a deleted file. This commit points it to the file containing the public class. --- include/grpcpp/impl/method_handler_impl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/grpcpp/impl/method_handler_impl.h b/include/grpcpp/impl/method_handler_impl.h index 7f3be6428b3..5eceb5ff915 100644 --- a/include/grpcpp/impl/method_handler_impl.h +++ b/include/grpcpp/impl/method_handler_impl.h @@ -19,6 +19,6 @@ #ifndef GRPCPP_IMPL_METHOD_HANDLER_IMPL_H #define GRPCPP_IMPL_METHOD_HANDLER_IMPL_H -#include +#include #endif // GRPCPP_IMPL_METHOD_HANDLER_IMPL_H From 4dfff7398e2855cbb048b868d463e73f990f5f56 Mon Sep 17 00:00:00 2001 From: Karthik Ravi Shankar Date: Fri, 18 Sep 2020 11:55:07 -0700 Subject: [PATCH 3/3] Remove deleted method_handler_impl.h file from build_autogenerated.yaml --- build_autogenerated.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml index a79a1d1f312..049c0c4a4b0 100644 --- a/build_autogenerated.yaml +++ b/build_autogenerated.yaml @@ -2023,7 +2023,6 @@ libs: - include/grpcpp/impl/codegen/message_allocator.h - include/grpcpp/impl/codegen/metadata_map.h - include/grpcpp/impl/codegen/method_handler.h - - include/grpcpp/impl/codegen/method_handler_impl.h - include/grpcpp/impl/codegen/proto_buffer_reader.h - include/grpcpp/impl/codegen/proto_buffer_writer.h - include/grpcpp/impl/codegen/proto_utils.h @@ -2388,7 +2387,6 @@ libs: - include/grpcpp/impl/codegen/message_allocator.h - include/grpcpp/impl/codegen/metadata_map.h - include/grpcpp/impl/codegen/method_handler.h - - include/grpcpp/impl/codegen/method_handler_impl.h - include/grpcpp/impl/codegen/proto_buffer_reader.h - include/grpcpp/impl/codegen/proto_buffer_writer.h - include/grpcpp/impl/codegen/proto_utils.h