Ensure RTE library can be used with uVision (C++ 14) (#1414) (#2360)

grasci-arm · edriouk · web-flow · commit ac422da21c0c · 2026-02-09T15:13:50.000+01:00
Co-authored-by: Evgueni Driouk &lt;edriouk@arm.com&gt;
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -108,6 +108,7 @@ auto key_set(const M& m) {`
`108`	`108`	`*`
`109`	`109`	`* @complexity Linear in the size of the container.`
`110`	`110`	`*/`
	`111`	`+#if defined(__cpp_lib_optional)`
`111`	`112`	`template <typename Container, typename Predicate>`
`112`	`113`	`auto find_item(Container& c, Predicate pred)`
`113`	`114`	`-> std::optional<std::reference_wrapper<typename Container::value_type>>`
`@@ -118,6 +119,7 @@ auto find_item(Container& c, Predicate pred)`
`118`	`119`	`}`
`119`	`120`	`return *it; // reference, not a copy`
`120`	`121`	`}`
	`122`	`+#endif`
`121`	`123`
`122`	`124`	`/**`
`123`	`125`	`* @brief string pair`