cleanup: prepare for clang-tidy 18 (#14160)

Remove redundant inline
googleapis · May 8, 2024 · b539a14 · b539a14
1 parent 6c959f4
commit b539a14
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 32 deletions.
diff --git a/google/cloud/bigquery/v2/minimal/internal/dataset_retry_policy.h b/google/cloud/bigquery/v2/minimal/internal/dataset_retry_policy.h
@@ -26,7 +26,7 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
 
 // Rest status code semantics for retrying requests.
 struct DatasetRetryTraits {
-  static inline bool IsPermanentFailure(google::cloud::Status const& status) {
+  static bool IsPermanentFailure(google::cloud::Status const& status) {
     return status.code() != StatusCode::kResourceExhausted &&
            status.code() != StatusCode::kUnavailable;
   }

diff --git a/google/cloud/bigquery/v2/minimal/internal/job_retry_policy.h b/google/cloud/bigquery/v2/minimal/internal/job_retry_policy.h
@@ -28,7 +28,7 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
 
 // Rest status code semantics for retrying requests.
 struct BigQueryJobRetryTraits {
-  static inline bool IsPermanentFailure(google::cloud::Status const& status) {
+  static bool IsPermanentFailure(google::cloud::Status const& status) {
     return status.code() != StatusCode::kDeadlineExceeded &&
            status.code() != StatusCode::kResourceExhausted &&
            status.code() != StatusCode::kUnavailable;

diff --git a/google/cloud/bigquery/v2/minimal/internal/project_retry_policy.h b/google/cloud/bigquery/v2/minimal/internal/project_retry_policy.h
@@ -26,7 +26,7 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
 
 // Rest status code semantics for retrying requests.
 struct ProjectRetryTraits {
-  static inline bool IsPermanentFailure(google::cloud::Status const& status) {
+  static bool IsPermanentFailure(google::cloud::Status const& status) {
     return status.code() != StatusCode::kResourceExhausted &&
            status.code() != StatusCode::kUnavailable;
   }

diff --git a/google/cloud/bigquery/v2/minimal/internal/table_retry_policy.h b/google/cloud/bigquery/v2/minimal/internal/table_retry_policy.h
@@ -26,7 +26,7 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
 
 // Rest status code semantics for retrying requests.
 struct TableRetryTraits {
-  static inline bool IsPermanentFailure(google::cloud::Status const& status) {
+  static bool IsPermanentFailure(google::cloud::Status const& status) {
     return status.code() != StatusCode::kResourceExhausted &&
            status.code() != StatusCode::kUnavailable;
   }

diff --git a/google/cloud/bigtable/internal/retry_traits.h b/google/cloud/bigtable/internal/retry_traits.h
@@ -28,22 +28,22 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
 
 /// An adapter to use `grpc::Status` with the `google::cloud::*Policies`.
 struct SafeGrpcRetry {
-  static inline bool IsOk(Status const& status) { return status.ok(); }
-  static inline bool IsTransientFailure(Status const& status) {
+  static bool IsOk(Status const& status) { return status.ok(); }
+  static bool IsTransientFailure(Status const& status) {
     auto const code = status.code();
     return code == StatusCode::kAborted || code == StatusCode::kUnavailable ||
            google::cloud::internal::IsTransientInternalError(status);
   }
-  static inline bool IsPermanentFailure(Status const& status) {
+  static bool IsPermanentFailure(Status const& status) {
     return !IsOk(status) && !IsTransientFailure(status);
   }
 
   // TODO(#2344) - remove ::grpc::Status version.
-  static inline bool IsOk(grpc::Status const& status) { return status.ok(); }
-  static inline bool IsTransientFailure(grpc::Status const& status) {
+  static bool IsOk(grpc::Status const& status) { return status.ok(); }
+  static bool IsTransientFailure(grpc::Status const& status) {
     return IsTransientFailure(MakeStatusFromRpcError(status));
   }
-  static inline bool IsPermanentFailure(grpc::Status const& status) {
+  static bool IsPermanentFailure(grpc::Status const& status) {
     return !IsOk(status) && !IsTransientFailure(status);
   }
 };

diff --git a/google/cloud/internal/oauth2_compute_engine_credentials.cc b/google/cloud/internal/oauth2_compute_engine_credentials.cc
@@ -47,7 +47,7 @@ DoMetadataServerGetRequest(rest_internal::RestClient& client,
 }
 
 struct DefaultUniverseDomainRetryTraits {
-  static inline bool IsPermanentFailure(google::cloud::Status const& status) {
+  static bool IsPermanentFailure(google::cloud::Status const& status) {
     return status.code() != StatusCode::kOk &&
            status.code() != StatusCode::kUnavailable;
   }

diff --git a/google/cloud/internal/retry_info.h b/google/cloud/internal/retry_info.h
@@ -37,11 +37,11 @@ class RetryInfo {
 
   std::chrono::nanoseconds retry_delay() const { return retry_delay_; }
 
-  friend inline bool operator==(RetryInfo const& a, RetryInfo const& b) {
+  friend bool operator==(RetryInfo const& a, RetryInfo const& b) {
     return a.retry_delay_ == b.retry_delay_;
   }
 
-  friend inline bool operator!=(RetryInfo const& a, RetryInfo const& b) {
+  friend bool operator!=(RetryInfo const& a, RetryInfo const& b) {
     return !(a == b);
   }
 

diff --git a/google/cloud/pubsub/retry_policy.h b/google/cloud/pubsub/retry_policy.h
@@ -27,7 +27,7 @@ namespace pubsub_internal {
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
 /// Define the gRPC status code semantics for retrying requests.
 struct RetryTraits {
-  static inline bool IsPermanentFailure(google::cloud::Status const& status) {
+  static bool IsPermanentFailure(google::cloud::Status const& status) {
     return status.code() != StatusCode::kOk &&
            status.code() != StatusCode::kAborted &&
            status.code() != StatusCode::kInternal &&

diff --git a/google/cloud/spanner/retry_policy.h b/google/cloud/spanner/retry_policy.h
@@ -28,28 +28,24 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
 
 /// Define the gRPC status code semantics for retrying requests.
 struct SafeGrpcRetry {
-  static inline bool IsOk(google::cloud::Status const& status) {
-    return status.ok();
-  }
-  static inline bool IsTransientFailure(google::cloud::Status const& status) {
+  static bool IsOk(google::cloud::Status const& status) { return status.ok(); }
+  static bool IsTransientFailure(google::cloud::Status const& status) {
     return status.code() == StatusCode::kUnavailable ||
            status.code() == StatusCode::kResourceExhausted ||
            internal::IsTransientInternalError(status);
   }
-  static inline bool IsPermanentFailure(google::cloud::Status const& status) {
+  static bool IsPermanentFailure(google::cloud::Status const& status) {
     return !IsOk(status) && !IsTransientFailure(status);
   }
 };
 
 /// Define the gRPC status code semantics for rerunning transactions.
 struct SafeTransactionRerun {
-  static inline bool IsOk(google::cloud::Status const& status) {
-    return status.ok();
-  }
-  static inline bool IsTransientFailure(google::cloud::Status const& status) {
+  static bool IsOk(google::cloud::Status const& status) { return status.ok(); }
+  static bool IsTransientFailure(google::cloud::Status const& status) {
     return status.code() == StatusCode::kAborted || IsSessionNotFound(status);
   }
-  static inline bool IsPermanentFailure(google::cloud::Status const& status) {
+  static bool IsPermanentFailure(google::cloud::Status const& status) {
     return !IsOk(status) && !IsTransientFailure(status);
   }
 };

diff --git a/google/cloud/status.cc b/google/cloud/status.cc
@@ -108,15 +108,13 @@ class Status::Impl {
   // `internal::SetPayload()` function.
   PayloadType& payload() { return payload_; }
 
-  friend inline bool operator==(Impl const& a, Impl const& b) {
+  friend bool operator==(Impl const& a, Impl const& b) {
     return a.code_ == b.code_ && a.message_ == b.message_ &&
            a.error_info_ == b.error_info_ && a.retry_info_ == b.retry_info_ &&
            a.payload_ == b.payload_;
   }
 
-  friend inline bool operator!=(Impl const& a, Impl const& b) {
-    return !(a == b);
-  }
+  friend bool operator!=(Impl const& a, Impl const& b) { return !(a == b); }
 
  private:
   StatusCode code_;

diff --git a/google/cloud/status.h b/google/cloud/status.h
@@ -353,12 +353,10 @@ class Status {
    */
   ErrorInfo const& error_info() const;
 
-  friend inline bool operator==(Status const& a, Status const& b) {
+  friend bool operator==(Status const& a, Status const& b) {
     return (a.ok() && b.ok()) || Equals(a, b);
   }
-  friend inline bool operator!=(Status const& a, Status const& b) {
-    return !(a == b);
-  }
+  friend bool operator!=(Status const& a, Status const& b) { return !(a == b); }
 
  private:
   static bool Equals(Status const& a, Status const& b);