Skip to content

impl(generator): remove deprecated declaration pragma #14854

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

Merged
scotthart merged 3 commits into from
Nov 22, 2024
Merged

impl(generator): remove deprecated declaration pragma #14854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a6f9329
impl(generator): remove deprecated declaration pragma
scotthart Nov 21, 2024
4f55b20
generator integration tests
scotthart Nov 21, 2024
46aedac
generated code
scotthart Nov 21, 2024
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
1 change: 0 additions & 1 deletion generator/integration_tests/golden/v1/deprecated_client.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
// If you make any local changes, they will be lost.
// source: generator/integration_tests/test_deprecated.proto

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "generator/integration_tests/golden/v1/deprecated_client.h"
#include <memory>
#include <utility>
Expand Down
1 change: 0 additions & 1 deletion generator/integration_tests/golden/v1/deprecated_client.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_DEPRECATED_CLIENT_H
#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_DEPRECATED_CLIENT_H

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "generator/integration_tests/golden/v1/deprecated_connection.h"
#include "google/cloud/future.h"
#include "google/cloud/options.h"
Expand Down
1 change: 0 additions & 1 deletion generator/integration_tests/golden/v1/deprecated_connection.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
// If you make any local changes, they will be lost.
// source: generator/integration_tests/test_deprecated.proto

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "generator/integration_tests/golden/v1/deprecated_connection.h"
#include "generator/integration_tests/golden/v1/deprecated_options.h"
#include "generator/integration_tests/golden/v1/internal/deprecated_connection_impl.h"
Expand Down
1 change: 0 additions & 1 deletion generator/integration_tests/golden/v1/deprecated_connection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_DEPRECATED_CONNECTION_H
#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_DEPRECATED_CONNECTION_H

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "generator/integration_tests/golden/v1/deprecated_connection_idempotency_policy.h"
#include "generator/integration_tests/golden/v1/internal/deprecated_retry_traits.h"
#include "google/cloud/backoff_policy.h"
Expand Down
1 change: 0 additions & 1 deletion generator/integration_tests/golden/v1/deprecated_connection_idempotency_policy.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
// If you make any local changes, they will be lost.
// source: generator/integration_tests/test_deprecated.proto

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "generator/integration_tests/golden/v1/deprecated_connection_idempotency_policy.h"
#include <memory>

Expand Down
1 change: 0 additions & 1 deletion generator/integration_tests/golden/v1/deprecated_connection_idempotency_policy.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_DEPRECATED_CONNECTION_IDEMPOTENCY_POLICY_H
#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_DEPRECATED_CONNECTION_IDEMPOTENCY_POLICY_H

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "google/cloud/idempotency.h"
#include "google/cloud/version.h"
#include <generator/integration_tests/test_deprecated.grpc.pb.h>
Expand Down
1 change: 0 additions & 1 deletion generator/integration_tests/golden/v1/deprecated_options.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_DEPRECATED_OPTIONS_H
#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_DEPRECATED_OPTIONS_H

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "generator/integration_tests/golden/v1/deprecated_connection.h"
#include "generator/integration_tests/golden/v1/deprecated_connection_idempotency_policy.h"
#include "google/cloud/backoff_policy.h"
Expand Down
1 change: 0 additions & 1 deletion generator/integration_tests/golden/v1/deprecated_rest_connection.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
// If you make any local changes, they will be lost.
// source: generator/integration_tests/test_deprecated.proto

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "generator/integration_tests/golden/v1/deprecated_rest_connection.h"
#include "generator/integration_tests/golden/v1/deprecated_options.h"
#include "generator/integration_tests/golden/v1/internal/deprecated_option_defaults.h"
Expand Down
1 change: 0 additions & 1 deletion generator/integration_tests/golden/v1/deprecated_rest_connection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_DEPRECATED_REST_CONNECTION_H
#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_DEPRECATED_REST_CONNECTION_H

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "generator/integration_tests/golden/v1/deprecated_connection.h"
#include "google/cloud/options.h"
#include "google/cloud/version.h"
Expand Down
1 change: 0 additions & 1 deletion generator/integration_tests/golden/v1/internal/deprecated_auth_decorator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
// If you make any local changes, they will be lost.
// source: generator/integration_tests/test_deprecated.proto

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "generator/integration_tests/golden/v1/internal/deprecated_auth_decorator.h"
#include <generator/integration_tests/test_deprecated.grpc.pb.h>
#include <memory>
Expand Down
1 change: 0 additions & 1 deletion generator/integration_tests/golden/v1/internal/deprecated_auth_decorator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_DEPRECATED_AUTH_DECORATOR_H
#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_DEPRECATED_AUTH_DECORATOR_H

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "generator/integration_tests/golden/v1/internal/deprecated_stub.h"
#include "google/cloud/internal/unified_grpc_credentials.h"
#include "google/cloud/version.h"
Expand Down
1 change: 0 additions & 1 deletion generator/integration_tests/golden/v1/internal/deprecated_connection_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
// If you make any local changes, they will be lost.
// source: generator/integration_tests/test_deprecated.proto

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "generator/integration_tests/golden/v1/internal/deprecated_connection_impl.h"
#include "generator/integration_tests/golden/v1/internal/deprecated_option_defaults.h"
#include "google/cloud/background_threads.h"
Expand Down
1 change: 0 additions & 1 deletion generator/integration_tests/golden/v1/internal/deprecated_connection_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_DEPRECATED_CONNECTION_IMPL_H
#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_DEPRECATED_CONNECTION_IMPL_H

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "generator/integration_tests/golden/v1/deprecated_connection.h"
#include "generator/integration_tests/golden/v1/deprecated_connection_idempotency_policy.h"
#include "generator/integration_tests/golden/v1/deprecated_options.h"
Expand Down
1 change: 0 additions & 1 deletion generator/integration_tests/golden/v1/internal/deprecated_logging_decorator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
// If you make any local changes, they will be lost.
// source: generator/integration_tests/test_deprecated.proto

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "generator/integration_tests/golden/v1/internal/deprecated_logging_decorator.h"
#include "google/cloud/internal/log_wrapper.h"
#include "google/cloud/status_or.h"
Expand Down
1 change: 0 additions & 1 deletion generator/integration_tests/golden/v1/internal/deprecated_logging_decorator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_DEPRECATED_LOGGING_DECORATOR_H
#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_DEPRECATED_LOGGING_DECORATOR_H

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "generator/integration_tests/golden/v1/internal/deprecated_stub.h"
#include "google/cloud/tracing_options.h"
#include "google/cloud/version.h"
Expand Down
1 change: 0 additions & 1 deletion generator/integration_tests/golden/v1/internal/deprecated_metadata_decorator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
// If you make any local changes, they will be lost.
// source: generator/integration_tests/test_deprecated.proto

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "generator/integration_tests/golden/v1/internal/deprecated_metadata_decorator.h"
#include "google/cloud/grpc_options.h"
#include "google/cloud/internal/absl_str_cat_quiet.h"
Expand Down
1 change: 0 additions & 1 deletion generator/integration_tests/golden/v1/internal/deprecated_metadata_decorator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_DEPRECATED_METADATA_DECORATOR_H
#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_DEPRECATED_METADATA_DECORATOR_H

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "generator/integration_tests/golden/v1/internal/deprecated_stub.h"
#include "google/cloud/options.h"
#include "google/cloud/version.h"
Expand Down
1 change: 0 additions & 1 deletion generator/integration_tests/golden/v1/internal/deprecated_option_defaults.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
// If you make any local changes, they will be lost.
// source: generator/integration_tests/test_deprecated.proto

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "generator/integration_tests/golden/v1/internal/deprecated_option_defaults.h"
#include "generator/integration_tests/golden/v1/deprecated_connection.h"
#include "generator/integration_tests/golden/v1/deprecated_options.h"
Expand Down
1 change: 0 additions & 1 deletion generator/integration_tests/golden/v1/internal/deprecated_option_defaults.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_DEPRECATED_OPTION_DEFAULTS_H
#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_DEPRECATED_OPTION_DEFAULTS_H

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "google/cloud/options.h"
#include "google/cloud/version.h"

Expand Down
1 change: 0 additions & 1 deletion generator/integration_tests/golden/v1/internal/deprecated_rest_connection_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
// If you make any local changes, they will be lost.
// source: generator/integration_tests/test_deprecated.proto

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "generator/integration_tests/golden/v1/internal/deprecated_rest_connection_impl.h"
#include "generator/integration_tests/golden/v1/internal/deprecated_rest_stub_factory.h"
#include "google/cloud/common_options.h"
Expand Down
1 change: 0 additions & 1 deletion generator/integration_tests/golden/v1/internal/deprecated_rest_connection_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_DEPRECATED_REST_CONNECTION_IMPL_H
#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_DEPRECATED_REST_CONNECTION_IMPL_H

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "generator/integration_tests/golden/v1/deprecated_connection.h"
#include "generator/integration_tests/golden/v1/deprecated_connection_idempotency_policy.h"
#include "generator/integration_tests/golden/v1/deprecated_options.h"
Expand Down
1 change: 0 additions & 1 deletion generator/integration_tests/golden/v1/internal/deprecated_rest_logging_decorator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
// If you make any local changes, they will be lost.
// source: generator/integration_tests/test_deprecated.proto

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "generator/integration_tests/golden/v1/internal/deprecated_rest_logging_decorator.h"
#include "google/cloud/internal/log_wrapper.h"
#include "google/cloud/status_or.h"
Expand Down
1 change: 0 additions & 1 deletion generator/integration_tests/golden/v1/internal/deprecated_rest_logging_decorator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_DEPRECATED_REST_LOGGING_DECORATOR_H
#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_DEPRECATED_REST_LOGGING_DECORATOR_H

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "generator/integration_tests/golden/v1/internal/deprecated_rest_stub.h"
#include "google/cloud/future.h"
#include "google/cloud/internal/rest_context.h"
Expand Down
1 change: 0 additions & 1 deletion generator/integration_tests/golden/v1/internal/deprecated_rest_metadata_decorator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
// If you make any local changes, they will be lost.
// source: generator/integration_tests/test_deprecated.proto

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "generator/integration_tests/golden/v1/internal/deprecated_rest_metadata_decorator.h"
#include "absl/strings/str_format.h"
#include "google/cloud/internal/absl_str_cat_quiet.h"
Expand Down
1 change: 0 additions & 1 deletion generator/integration_tests/golden/v1/internal/deprecated_rest_metadata_decorator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_DEPRECATED_REST_METADATA_DECORATOR_H
#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_DEPRECATED_REST_METADATA_DECORATOR_H

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "generator/integration_tests/golden/v1/internal/deprecated_rest_stub.h"
#include "google/cloud/future.h"
#include "google/cloud/rest_options.h"
Expand Down
1 change: 0 additions & 1 deletion generator/integration_tests/golden/v1/internal/deprecated_rest_stub.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
// If you make any local changes, they will be lost.
// source: generator/integration_tests/test_deprecated.proto

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "generator/integration_tests/golden/v1/internal/deprecated_rest_stub.h"
#include "google/cloud/common_options.h"
#include "google/cloud/internal/absl_str_cat_quiet.h"
Expand Down
1 change: 0 additions & 1 deletion generator/integration_tests/golden/v1/internal/deprecated_rest_stub.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_DEPRECATED_REST_STUB_H
#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_DEPRECATED_REST_STUB_H

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "google/cloud/completion_queue.h"
#include "google/cloud/internal/rest_client.h"
#include "google/cloud/internal/rest_context.h"
Expand Down
1 change: 0 additions & 1 deletion generator/integration_tests/golden/v1/internal/deprecated_rest_stub_factory.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
// If you make any local changes, they will be lost.
// source: generator/integration_tests/test_deprecated.proto

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "generator/integration_tests/golden/v1/internal/deprecated_rest_stub_factory.h"
#include "absl/strings/match.h"
#include "generator/integration_tests/golden/v1/internal/deprecated_rest_logging_decorator.h"
Expand Down
1 change: 0 additions & 1 deletion generator/integration_tests/golden/v1/internal/deprecated_rest_stub_factory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_DEPRECATED_REST_STUB_FACTORY_H
#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_DEPRECATED_REST_STUB_FACTORY_H

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "generator/integration_tests/golden/v1/internal/deprecated_rest_stub.h"
#include "google/cloud/options.h"
#include "google/cloud/version.h"
Expand Down
1 change: 0 additions & 1 deletion generator/integration_tests/golden/v1/internal/deprecated_retry_traits.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_DEPRECATED_RETRY_TRAITS_H
#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_DEPRECATED_RETRY_TRAITS_H

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "google/cloud/status.h"
#include "google/cloud/version.h"

Expand Down
1 change: 0 additions & 1 deletion generator/integration_tests/golden/v1/internal/deprecated_sources.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
// source: generator/integration_tests/test_deprecated.proto

// NOLINTBEGIN(bugprone-suspicious-include)
#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "generator/integration_tests/golden/v1/deprecated_client.cc"
#include "generator/integration_tests/golden/v1/deprecated_connection.cc"
#include "generator/integration_tests/golden/v1/deprecated_connection_idempotency_policy.cc"
Expand Down
1 change: 0 additions & 1 deletion generator/integration_tests/golden/v1/internal/deprecated_stub.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
// If you make any local changes, they will be lost.
// source: generator/integration_tests/test_deprecated.proto

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "generator/integration_tests/golden/v1/internal/deprecated_stub.h"
#include "google/cloud/grpc_error_delegate.h"
#include "google/cloud/status_or.h"
Expand Down
1 change: 0 additions & 1 deletion generator/integration_tests/golden/v1/internal/deprecated_stub.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_DEPRECATED_STUB_H
#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_DEPRECATED_STUB_H

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "google/cloud/options.h"
#include "google/cloud/status_or.h"
#include "google/cloud/version.h"
Expand Down
1 change: 0 additions & 1 deletion generator/integration_tests/golden/v1/internal/deprecated_stub_factory.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
// If you make any local changes, they will be lost.
// source: generator/integration_tests/test_deprecated.proto

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "generator/integration_tests/golden/v1/internal/deprecated_stub_factory.h"
#include "generator/integration_tests/golden/v1/internal/deprecated_auth_decorator.h"
#include "generator/integration_tests/golden/v1/internal/deprecated_logging_decorator.h"
Expand Down
1 change: 0 additions & 1 deletion generator/integration_tests/golden/v1/internal/deprecated_stub_factory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_DEPRECATED_STUB_FACTORY_H
#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_DEPRECATED_STUB_FACTORY_H

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "generator/integration_tests/golden/v1/internal/deprecated_stub.h"
#include "google/cloud/internal/unified_grpc_credentials.h"
#include "google/cloud/options.h"
Expand Down
1 change: 0 additions & 1 deletion generator/integration_tests/golden/v1/internal/deprecated_tracing_connection.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
// If you make any local changes, they will be lost.
// source: generator/integration_tests/test_deprecated.proto

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "generator/integration_tests/golden/v1/internal/deprecated_tracing_connection.h"
#include "google/cloud/internal/opentelemetry.h"
#include <memory>
Expand Down
1 change: 0 additions & 1 deletion generator/integration_tests/golden/v1/internal/deprecated_tracing_connection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_DEPRECATED_TRACING_CONNECTION_H
#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_DEPRECATED_TRACING_CONNECTION_H

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "generator/integration_tests/golden/v1/deprecated_connection.h"
#include "google/cloud/version.h"
#include <memory>
Expand Down
1 change: 0 additions & 1 deletion generator/integration_tests/golden/v1/internal/deprecated_tracing_stub.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
// If you make any local changes, they will be lost.
// source: generator/integration_tests/test_deprecated.proto

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "generator/integration_tests/golden/v1/internal/deprecated_tracing_stub.h"
#include "google/cloud/internal/grpc_opentelemetry.h"
#include <memory>
Expand Down
1 change: 0 additions & 1 deletion generator/integration_tests/golden/v1/internal/deprecated_tracing_stub.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_DEPRECATED_TRACING_STUB_H
#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_DEPRECATED_TRACING_STUB_H

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "generator/integration_tests/golden/v1/internal/deprecated_stub.h"
#include "google/cloud/internal/trace_propagator.h"
#include "google/cloud/options.h"
Expand Down
1 change: 0 additions & 1 deletion generator/integration_tests/golden/v1/mocks/mock_deprecated_connection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_MOCKS_MOCK_DEPRECATED_CONNECTION_H
#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_MOCKS_MOCK_DEPRECATED_CONNECTION_H

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "generator/integration_tests/golden/v1/deprecated_connection.h"
#include <gmock/gmock.h>

Expand Down
1 change: 0 additions & 1 deletion generator/integration_tests/golden/v1/samples/deprecated_client_samples.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
// If you make any local changes, they will be lost.
// source: generator/integration_tests/test_deprecated.proto

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "generator/integration_tests/golden/v1/deprecated_client.h"
#include "generator/integration_tests/golden/v1/deprecated_connection_idempotency_policy.h"
#include "generator/integration_tests/golden/v1/deprecated_options.h"
Expand Down
14 changes: 3 additions & 11 deletions generator/internal/service_code_generator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,13 +293,12 @@ VarsDictionary ServiceCodeGenerator::MergeServiceAndMethodVars(

void ServiceCodeGenerator::HeaderLocalIncludes(
std::vector<std::string> const& local_includes) {
GenerateLocalIncludes(header_, local_includes, FileType::kHeaderFile,
IsDeprecated());
GenerateLocalIncludes(header_, local_includes, FileType::kHeaderFile);
}

void ServiceCodeGenerator::CcLocalIncludes(
std::vector<std::string> const& local_includes) {
GenerateLocalIncludes(cc_, local_includes, FileType::kCcFile, IsDeprecated());
GenerateLocalIncludes(cc_, local_includes, FileType::kCcFile);
}

void ServiceCodeGenerator::HeaderSystemIncludes(
Expand Down Expand Up @@ -385,14 +384,7 @@ void ServiceCodeGenerator::CcPrintMethod(
}

void ServiceCodeGenerator::GenerateLocalIncludes(
Printer& p, std::vector<std::string> local_includes, FileType file_type,
bool is_deprecated) {
if (is_deprecated) {
p.Print(
"#include "
"\"google/cloud/internal/disable_deprecation_warnings.inc\"\n");
}

Printer& p, std::vector<std::string> local_includes, FileType file_type) {
if (file_type == FileType::kCcFile) {
std::sort(local_includes.begin() + 1, local_includes.end());
} else {
Expand Down
2 changes: 1 addition & 1 deletion generator/internal/service_code_generator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ class ServiceCodeGenerator : public GeneratorInterface {
enum class FileType { kHeaderFile, kCcFile };
static void GenerateLocalIncludes(Printer& p,
std::vector<std::string> local_includes,
FileType file_type, bool is_deprecated);
FileType file_type);
static void GenerateSystemIncludes(Printer& p,
std::vector<std::string> system_includes);

Expand Down
1 change: 0 additions & 1 deletion google/cloud/channel/v1/cloud_channel_reports_client.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
// If you make any local changes, they will be lost.
// source: google/cloud/channel/v1/reports_service.proto

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "google/cloud/channel/v1/cloud_channel_reports_client.h"
#include <memory>
#include <utility>
Expand Down
1 change: 0 additions & 1 deletion google/cloud/channel/v1/cloud_channel_reports_client.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHANNEL_V1_CLOUD_CHANNEL_REPORTS_CLIENT_H
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHANNEL_V1_CLOUD_CHANNEL_REPORTS_CLIENT_H

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "google/cloud/channel/v1/cloud_channel_reports_connection.h"
#include "google/cloud/future.h"
#include "google/cloud/no_await_tag.h"
Expand Down
1 change: 0 additions & 1 deletion google/cloud/channel/v1/cloud_channel_reports_connection.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
// If you make any local changes, they will be lost.
// source: google/cloud/channel/v1/reports_service.proto

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "google/cloud/channel/v1/cloud_channel_reports_connection.h"
#include "google/cloud/channel/v1/cloud_channel_reports_options.h"
#include "google/cloud/channel/v1/internal/cloud_channel_reports_connection_impl.h"
Expand Down
Loading
Loading