From ada599128cfc283f6f1330760a1d2b80d31eff30 Mon Sep 17 00:00:00 2001
From: Hong Shin <hongshin@google.com>
Date: Thu, 12 Sep 2024 10:31:02 -0700
Subject: [PATCH] hpb: Move add_const_if_T_is_const to template_help.h and
 delete traits.h

PiperOrigin-RevId: 673906280
---
 hpb/BUILD                    | 11 +----------
 hpb/internal/BUILD           |  1 +
 hpb/internal/template_help.h |  4 ++++
 hpb/repeated_field.h         |  3 +--
 hpb/traits.h                 | 21 ---------------------
 5 files changed, 7 insertions(+), 33 deletions(-)
 delete mode 100644 hpb/traits.h

diff --git a/hpb/BUILD b/hpb/BUILD
index 5156934c1d..7b8f81a806 100644
--- a/hpb/BUILD
+++ b/hpb/BUILD
@@ -63,8 +63,8 @@ cc_library(
     visibility = ["//visibility:public"],
     deps = [
         ":hpb",
-        ":traits",
         "//hpb/backend/upb:interop",
+        "//hpb/internal:template_help",
         "//upb:base",
         "//upb:mem",
         "//upb:message",
@@ -74,15 +74,6 @@ cc_library(
     ],
 )
 
-# Internally used type traits.
-cc_library(
-    name = "traits",
-    hdrs = [
-        "traits.h",
-    ],
-    copts = UPB_DEFAULT_CPPOPTS,
-)
-
 # Common support code for C++ generated code.
 cc_library(
     name = "generated_hpb_support",
diff --git a/hpb/internal/BUILD b/hpb/internal/BUILD
index 8c3ba40a44..07e911e33d 100644
--- a/hpb/internal/BUILD
+++ b/hpb/internal/BUILD
@@ -15,6 +15,7 @@ package(default_applicable_licenses = ["//:license"])
 cc_library(
     name = "template_help",
     hdrs = ["template_help.h"],
+    copts = UPB_DEFAULT_CPPOPTS,
     visibility = ["//hpb:__subpackages__"],
     deps = [
         "//hpb:ptr",
diff --git a/hpb/internal/template_help.h b/hpb/internal/template_help.h
index a77ea2b931..4757d80b8b 100644
--- a/hpb/internal/template_help.h
+++ b/hpb/internal/template_help.h
@@ -43,6 +43,10 @@ using EnableIfHpbClass = std::enable_if_t<
 template <typename T>
 using EnableIfMutableProto = std::enable_if_t<!std::is_const<T>::value>;
 
+template <typename T, typename T2>
+using add_const_if_T_is_const =
+    std::conditional_t<std::is_const_v<T>, const T2, T2>;
+
 }  // namespace internal
 }  // namespace hpb
 
diff --git a/hpb/repeated_field.h b/hpb/repeated_field.h
index 3a5a7df939..5ec556772c 100644
--- a/hpb/repeated_field.h
+++ b/hpb/repeated_field.h
@@ -16,9 +16,8 @@
 
 #include "absl/strings/string_view.h"
 #include "google/protobuf/hpb/backend/upb/interop.h"
-#include "google/protobuf/hpb/hpb.h"
+#include "google/protobuf/hpb/internal/template_help.h"
 #include "google/protobuf/hpb/repeated_field_iterator.h"
-#include "google/protobuf/hpb/traits.h"
 #include "upb/base/string_view.h"
 #include "upb/mem/arena.h"
 #include "upb/message/array.h"
diff --git a/hpb/traits.h b/hpb/traits.h
deleted file mode 100644
index bb25646073..0000000000
--- a/hpb/traits.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2023 Google LLC.  All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file or at
-// https://developers.google.com/open-source/licenses/bsd
-
-#ifndef PROTOBUF_HPB_TRAITS_H_
-#define PROTOBUF_HPB_TRAITS_H_
-
-#include <type_traits>
-
-namespace hpb::internal {
-
-template <typename T, typename T2>
-using add_const_if_T_is_const =
-    std::conditional_t<std::is_const_v<T>, const T2, T2>;
-
-}  // namespace hpb::internal
-
-#endif  // PROTOBUF_HPB_TRAITS_H_