From 27942f19733d442998bd457531ffbc58ac3e8f63 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 14 Mar 2026 11:05:39 -1000
Subject: [PATCH] [helpers] Replace deprecated std::is_trivial in
 FixedRingBuffer (#14808)

---
 esphome/core/helpers.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/esphome/core/helpers.h b/esphome/core/helpers.h
index 2267208752..c2f4cace9a 100644
--- a/esphome/core/helpers.h
+++ b/esphome/core/helpers.h
@@ -417,7 +417,7 @@ template<typename T, size_t MAX_CAPACITY = std::numeric_limits<uint16_t>::max()>
 
   FixedRingBuffer() = default;
   ~FixedRingBuffer() {
-    if constexpr (std::is_trivial<T>::value) {
+    if constexpr (std::is_trivially_copyable<T>::value && std::is_trivially_default_constructible<T>::value) {
       ::operator delete(this->data_);
     } else {
       delete[] this->data_;
@@ -430,7 +430,7 @@ template<typename T, size_t MAX_CAPACITY = std::numeric_limits<uint16_t>::max()>
 
   /// Allocate capacity - can only be called once
   void init(index_type capacity) {
-    if constexpr (std::is_trivial<T>::value) {
+    if constexpr (std::is_trivially_copyable<T>::value && std::is_trivially_default_constructible<T>::value) {
       // Raw allocation without initialization (elements are written before read)
       // NOLINTNEXTLINE(bugprone-sizeof-expression)
       this->data_ = static_cast<T *>(::operator new(capacity * sizeof(T)));