From cfe34004ebfb45b8066fe9f220400158fe7a53dd Mon Sep 17 00:00:00 2001
From: Evgueni Driouk <edriouk@arm.com>
Date: Mon, 9 Feb 2026 14:24:24 +0100
Subject: [PATCH] Ensure RTE library can be used with uVision (C++ 14) (#1414)

---
 libs/rteutils/include/CollectionUtils.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libs/rteutils/include/CollectionUtils.h b/libs/rteutils/include/CollectionUtils.h
index 77ffb37a4..445864e1e 100644
--- a/libs/rteutils/include/CollectionUtils.h
+++ b/libs/rteutils/include/CollectionUtils.h
@@ -108,6 +108,7 @@ auto key_set(const M& m) {
  *
  * @complexity Linear in the size of the container.
  */
+#if defined(__cpp_lib_optional)
 template <typename Container, typename Predicate>
 auto find_item(Container& c, Predicate pred)
     -> std::optional<std::reference_wrapper<typename Container::value_type>>
@@ -118,6 +119,7 @@ auto find_item(Container& c, Predicate pred)
     }
     return *it;   // reference, not a copy
 }
+#endif
 
 /**
   * @brief string pair