Skip to content

chore: remove guards now that vcpkg has grpc 1.65.5 #14860

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ddelgrosso1 wants to merge 1 commit into from
Closed

chore: remove guards now that vcpkg has grpc 1.65.5 #14860

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions google/cloud/storage/benchmarks/async_throughput_benchmark.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,6 @@

#include "google/cloud/internal/port_platform.h"
#if GOOGLE_CLOUD_CPP_STORAGE_HAVE_GRPC && GOOGLE_CLOUD_CPP_HAVE_COROUTINES
// TODO(#14750): Remove this guard once vcpkg has a newer version of grpc
#if (GRPC_CPP_VERSION_MAJOR > 1 || \
(GRPC_CPP_VERSION_MAJOR == 1 && GRPC_CPP_VERSION_MINOR > 65) || \
(GRPC_CPP_VERSION_MAJOR == 1 && GRPC_CPP_VERSION_MINOR == 65 && \
GRPC_CPP_VERSION_PATCH >= 4))
#include "google/cloud/storage/async/client.h"
#include "google/cloud/storage/benchmarks/benchmark_utils.h"
#include "google/cloud/storage/client.h"
Expand Down Expand Up @@ -958,9 +953,5 @@ int main() {
return 0;
}

#endif // (GRPC_CPP_VERSION_MAJOR > 1 ||
// (GRPC_CPP_VERSION_MAJOR == 1 && GRPC_CPP_VERSION_MINOR > 65) ||
// (GRPC_CPP_VERSION_MAJOR == 1 && GRPC_CPP_VERSION_MINOR == 65 &&
// GRPC_CPP_VERSION_PATCH >= 4))
#endif // GOOGLE_CLOUD_CPP_STORAGE_HAVE_GRPC &&
// GOOGLE_CLOUD_CPP_HAVE_COROUTINES
Loading