From cf618b1b8c59d65dd86fdd9e41c59d4391f334e1 Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Thu, 13 Feb 2020 09:17:16 -0800 Subject: [PATCH] Removed unused sync_[no]_cxx11 files --- BUILD | 4 --- include/grpc++/impl/sync_cxx11.h | 28 ------------------- include/grpc++/impl/sync_no_cxx11.h | 28 ------------------- include/grpcpp/impl/sync_cxx11.h | 24 ---------------- include/grpcpp/impl/sync_no_cxx11.h | 24 ---------------- .../sanity/check_deprecated_grpc++.py | 2 -- 6 files changed, 110 deletions(-) delete mode 100644 include/grpc++/impl/sync_cxx11.h delete mode 100644 include/grpc++/impl/sync_no_cxx11.h delete mode 100644 include/grpcpp/impl/sync_cxx11.h delete mode 100644 include/grpcpp/impl/sync_no_cxx11.h diff --git a/BUILD b/BUILD index 9dc049fd288..bedfc5c280a 100644 --- a/BUILD +++ b/BUILD @@ -200,8 +200,6 @@ GRPCXX_PUBLIC_HDRS = [ "include/grpc++/impl/server_builder_plugin.h", "include/grpc++/impl/server_initializer.h", "include/grpc++/impl/service_type.h", - "include/grpc++/impl/sync_cxx11.h", - "include/grpc++/impl/sync_no_cxx11.h", "include/grpc++/security/auth_context.h", "include/grpc++/resource_quota.h", "include/grpc++/security/auth_metadata_processor.h", @@ -256,8 +254,6 @@ GRPCXX_PUBLIC_HDRS = [ "include/grpcpp/impl/server_initializer.h", "include/grpcpp/impl/server_initializer_impl.h", "include/grpcpp/impl/service_type.h", - "include/grpcpp/impl/sync_cxx11.h", - "include/grpcpp/impl/sync_no_cxx11.h", "include/grpcpp/resource_quota.h", "include/grpcpp/resource_quota_impl.h", "include/grpcpp/security/auth_context.h", diff --git a/include/grpc++/impl/sync_cxx11.h b/include/grpc++/impl/sync_cxx11.h deleted file mode 100644 index 8bcfb2ce818..00000000000 --- a/include/grpc++/impl/sync_cxx11.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * - * Copyright 2018 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. - * - */ - -// DEPRECATED: The headers in include/grpc++ are deprecated. Please include the -// headers in include/grpcpp instead. This header exists only for backwards -// compatibility. - -#ifndef GRPCXX_IMPL_SYNC_CXX11_H -#define GRPCXX_IMPL_SYNC_CXX11_H - -#include - -#endif // GRPCXX_IMPL_SYNC_CXX11_H diff --git a/include/grpc++/impl/sync_no_cxx11.h b/include/grpc++/impl/sync_no_cxx11.h deleted file mode 100644 index 5264567387a..00000000000 --- a/include/grpc++/impl/sync_no_cxx11.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * - * Copyright 2018 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. - * - */ - -// DEPRECATED: The headers in include/grpc++ are deprecated. Please include the -// headers in include/grpcpp instead. This header exists only for backwards -// compatibility. - -#ifndef GRPCXX_IMPL_SYNC_NO_CXX11_H -#define GRPCXX_IMPL_SYNC_NO_CXX11_H - -#include - -#endif // GRPCXX_IMPL_SYNC_NO_CXX11_H diff --git a/include/grpcpp/impl/sync_cxx11.h b/include/grpcpp/impl/sync_cxx11.h deleted file mode 100644 index 76dcfe391c9..00000000000 --- a/include/grpcpp/impl/sync_cxx11.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * - * Copyright 2015 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_IMPL_SYNC_CXX11_H -#define GRPCPP_IMPL_SYNC_CXX11_H - -#include - -#endif // GRPCPP_IMPL_SYNC_CXX11_H diff --git a/include/grpcpp/impl/sync_no_cxx11.h b/include/grpcpp/impl/sync_no_cxx11.h deleted file mode 100644 index cc2d4f104cf..00000000000 --- a/include/grpcpp/impl/sync_no_cxx11.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * - * Copyright 2015 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_IMPL_SYNC_NO_CXX11_H -#define GRPCPP_IMPL_SYNC_NO_CXX11_H - -#include - -#endif // GRPCPP_IMPL_SYNC_NO_CXX11_H diff --git a/tools/run_tests/sanity/check_deprecated_grpc++.py b/tools/run_tests/sanity/check_deprecated_grpc++.py index 4ec49fae394..02307fedaa8 100755 --- a/tools/run_tests/sanity/check_deprecated_grpc++.py +++ b/tools/run_tests/sanity/check_deprecated_grpc++.py @@ -51,10 +51,8 @@ expected_files = [ "include/grpc++/impl/rpc_service_method.h", "include/grpc++/impl/method_handler_impl.h", "include/grpc++/impl/server_builder_plugin.h", - "include/grpc++/impl/sync_cxx11.h", "include/grpc++/impl/server_initializer.h", "include/grpc++/impl/serialization_traits.h", - "include/grpc++/impl/sync_no_cxx11.h", "include/grpc++/impl/codegen/sync_stream.h", "include/grpc++/impl/codegen/channel_interface.h", "include/grpc++/impl/codegen/config_protobuf.h",