From 5d73e3af27a77031ce6c2e67e9a5c00e60272dcf Mon Sep 17 00:00:00 2001 From: Karthik Ravi Shankar Date: Mon, 3 Aug 2020 11:21:27 -0700 Subject: [PATCH 1/2] Remove error_details_impl.h https://github.com/grpc/grpc/pull/23601 should have removed error_details_impl.h, but it did not. This PR fixes this oversight. --- include/grpcpp/support/error_details_impl.h | 48 --------------------- 1 file changed, 48 deletions(-) delete mode 100644 include/grpcpp/support/error_details_impl.h diff --git a/include/grpcpp/support/error_details_impl.h b/include/grpcpp/support/error_details_impl.h deleted file mode 100644 index ae5f04ced8f..00000000000 --- a/include/grpcpp/support/error_details_impl.h +++ /dev/null @@ -1,48 +0,0 @@ -/* - * - * Copyright 2017 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_ERROR_DETAILS_IMPL_H -#define GRPCPP_SUPPORT_ERROR_DETAILS_IMPL_H - -#include - -namespace google { -namespace rpc { -class Status; -} // namespace rpc -} // namespace google - -namespace grpc_impl { - -/// Map a \a grpc::Status to a \a google::rpc::Status. -/// The given \a to object will be cleared. -/// On success, returns status with OK. -/// Returns status with \a INVALID_ARGUMENT, if failed to deserialize. -/// Returns status with \a FAILED_PRECONDITION, if \a to is nullptr. -grpc::Status ExtractErrorDetails(const grpc::Status& from, - ::google::rpc::Status* to); - -/// Map \a google::rpc::Status to a \a grpc::Status. -/// Returns OK on success. -/// Returns status with \a FAILED_PRECONDITION if \a to is nullptr. -grpc::Status SetErrorDetails(const ::google::rpc::Status& from, - grpc::Status* to); - -} // namespace grpc_impl - -#endif // GRPCPP_SUPPORT_ERROR_DETAILS_IMPL_H From 17b207ae93a04b02339882e0e846e468c827b411 Mon Sep 17 00:00:00 2001 From: Karthik Ravi Shankar Date: Mon, 3 Aug 2020 11:30:24 -0700 Subject: [PATCH 2/2] Fix build_autoregenerated.yaml --- build_autogenerated.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml index 115097a3749..9bd597bad31 100644 --- a/build_autogenerated.yaml +++ b/build_autogenerated.yaml @@ -2276,7 +2276,6 @@ libs: public_headers: - include/grpc++/support/error_details.h - include/grpcpp/support/error_details.h - - include/grpcpp/support/error_details_impl.h headers: [] src: - src/proto/grpc/status/status.proto