From 4f11776cb307120c8b5fa830bb5b9fbc4047ed27 Mon Sep 17 00:00:00 2001 From: Bradley White <14679271+devbww@users.noreply.github.com> Date: Tue, 3 May 2022 21:45:15 -0400 Subject: [PATCH] cleanup: remove remnant IAM deprecation macros `GOOGLE_CLOUD_CPP_BIGTABLE_IAM_DEPRECATED` disappeared in #8652. `GOOGLE_CLOUD_CPP_IAM_DEPRECATED` disappeared in #8667. --- cmake/GoogleCloudCppCommon.cmake | 2 -- google/cloud/version.h | 7 ------- 2 files changed, 9 deletions(-) diff --git a/cmake/GoogleCloudCppCommon.cmake b/cmake/GoogleCloudCppCommon.cmake index 1c83885fa93cd..76534cf295cb2 100644 --- a/cmake/GoogleCloudCppCommon.cmake +++ b/cmake/GoogleCloudCppCommon.cmake @@ -82,8 +82,6 @@ elseif (GOOGLE_CLOUD_CPP_GENERATE_DOXYGEN) # to be noops or have simple values. set(DOXYGEN_PREDEFINED "GOOGLE_CLOUD_CPP_DEPRECATED(x)=" - "GOOGLE_CLOUD_CPP_IAM_DEPRECATED(x)=" - "GOOGLE_CLOUD_CPP_BIGTABLE_IAM_DEPRECATED(x)=" "GOOGLE_CLOUD_CPP_SPANNER_ADMIN_API_DEPRECATED(x)=" "GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN=" "GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END=") diff --git a/google/cloud/version.h b/google/cloud/version.h index b60e2f1421359..17de4404fa73a 100644 --- a/google/cloud/version.h +++ b/google/cloud/version.h @@ -20,13 +20,6 @@ #include "google/cloud/internal/version_info.h" #include -#define GOOGLE_CLOUD_CPP_IAM_DEPRECATED \ - GOOGLE_CLOUD_CPP_DEPRECATED( \ - "this type predates IAM conditions and does not work with policies " \ - "that include IAM conditions. The functions that use this type are " \ - "deprecated and will be be removed on 2022-04-01 or shortly " \ - "after. See GitHub issue #5929 for more information.") - #define GOOGLE_CLOUD_CPP_VCONCAT(Ma, Mi, Pa) v##Ma##_##Mi##_##Pa #define GOOGLE_CLOUD_CPP_VEVAL(Ma, Mi, Pa) GOOGLE_CLOUD_CPP_VCONCAT(Ma, Mi, Pa) #define GOOGLE_CLOUD_CPP_NS \