From ed5e4563d681994a5aa20e1ed9444e9e89d556a8 Mon Sep 17 00:00:00 2001
From: Yash Tibrewal <yashkt@google.com>
Date: Fri, 21 Apr 2023 09:22:47 -0700
Subject: [PATCH] [Compiler Fix] Bring declarations and definitions to be in
 sync (#32911)

<!--

If you know who should review your pull request, please assign it to
that
person, otherwise the pull request would get assigned randomly.

If your pull request is for a specific language, please add the
appropriate
lang label.

-->
---
 src/core/ext/gcp/metadata_query.cc        | 15 +++++----------
 src/core/ext/gcp/metadata_query.h         | 15 ++++++++++-----
 src/core/lib/event_engine/event_engine.cc |  8 ++++----
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/core/ext/gcp/metadata_query.cc b/src/core/ext/gcp/metadata_query.cc
index 9383dae27ff..59a62dd0cc0 100644
--- a/src/core/ext/gcp/metadata_query.cc
+++ b/src/core/ext/gcp/metadata_query.cc
@@ -46,16 +46,11 @@ namespace grpc_core {
 
 TraceFlag grpc_metadata_query_trace(false, "metadata_query");
 
-constexpr const char MetadataQuery::kZoneAttribute[] =
-    "/computeMetadata/v1/instance/zone";
-constexpr const char MetadataQuery::kClusterNameAttribute[] =
-    "/computeMetadata/v1/instance/attributes/cluster-name";
-constexpr const char MetadataQuery::kRegionAttribute[] =
-    "/computeMetadata/v1/instance/region";
-constexpr const char MetadataQuery::kInstanceIdAttribute[] =
-    "/computeMetadata/v1/instance/id";
-constexpr const char MetadataQuery::kIPv6Attribute[] =
-    "/computeMetadata/v1/instance/network-interfaces/0/ipv6s";
+constexpr const char MetadataQuery::kZoneAttribute[];
+constexpr const char MetadataQuery::kClusterNameAttribute[];
+constexpr const char MetadataQuery::kRegionAttribute[];
+constexpr const char MetadataQuery::kInstanceIdAttribute[];
+constexpr const char MetadataQuery::kIPv6Attribute[];
 
 MetadataQuery::MetadataQuery(
     std::string attribute, grpc_polling_entity* pollent,
diff --git a/src/core/ext/gcp/metadata_query.h b/src/core/ext/gcp/metadata_query.h
index e0f4207ef6d..278a1f7a528 100644
--- a/src/core/ext/gcp/metadata_query.h
+++ b/src/core/ext/gcp/metadata_query.h
@@ -38,11 +38,16 @@ namespace grpc_core {
 // environment.
 class MetadataQuery : public InternallyRefCounted<MetadataQuery> {
  public:
-  static const char kZoneAttribute[];
-  static const char kClusterNameAttribute[];
-  static const char kRegionAttribute[];
-  static const char kInstanceIdAttribute[];
-  static const char kIPv6Attribute[];
+  static constexpr const char kZoneAttribute[] =
+      "/computeMetadata/v1/instance/zone";
+  static constexpr const char kClusterNameAttribute[] =
+      "/computeMetadata/v1/instance/attributes/cluster-name";
+  static constexpr const char kRegionAttribute[] =
+      "/computeMetadata/v1/instance/region";
+  static constexpr const char kInstanceIdAttribute[] =
+      "/computeMetadata/v1/instance/id";
+  static constexpr const char kIPv6Attribute[] =
+      "/computeMetadata/v1/instance/network-interfaces/0/ipv6s";
 
   MetadataQuery(
       std::string attribute, grpc_polling_entity* pollent,
diff --git a/src/core/lib/event_engine/event_engine.cc b/src/core/lib/event_engine/event_engine.cc
index 3164b181251..ff455a97375 100644
--- a/src/core/lib/event_engine/event_engine.cc
+++ b/src/core/lib/event_engine/event_engine.cc
@@ -20,10 +20,10 @@
 namespace grpc_event_engine {
 namespace experimental {
 
-constexpr EventEngine::TaskHandle EventEngine::TaskHandle::kInvalid = {-1, -1};
-constexpr EventEngine::ConnectionHandle
-    EventEngine::ConnectionHandle::kInvalid = {-1, -1};
-constexpr EventEngine::DNSResolver::LookupTaskHandle
+const EventEngine::TaskHandle EventEngine::TaskHandle::kInvalid = {-1, -1};
+const EventEngine::ConnectionHandle EventEngine::ConnectionHandle::kInvalid = {
+    -1, -1};
+const EventEngine::DNSResolver::LookupTaskHandle
     EventEngine::DNSResolver::LookupTaskHandle::kInvalid = {-1, -1};
 
 bool operator==(const EventEngine::TaskHandle& lhs,