Wrap calls to fmt::format to catch formatting exceptions

[lttng-tools.git] / src / common / container-wrapper.hpp

diff --git a/src/common/container-wrapper.hpp b/src/common/container-wrapper.hpp
index 5ee20dfeab3b2b3f92d94539ddf25dd156fae0e1..0ed96d44ac51f6126c92f8eb77ba1eaa0ddda047 100644 (file)
--- a/src/common/container-wrapper.hpp
+++ b/src/common/container-wrapper.hpp
@@ -99,7 +99,7 @@ public:
 
        iterator end()
        {
-               return iterator(*this, ContainerOperations::size(_container));
+               return iterator(*this, size());
        }
 
        const_iterator begin() const noexcept
@@ -109,10 +109,10 @@ public:
 
        const_iterator end() const
        {
-               return const_iterator(*this, ContainerOperations::size(_container));
+               return const_iterator(*this, size());
        }
 
-       std::size_t size() const noexcept
+       std::size_t size() const
        {
                return ContainerOperations::size(_container);
        }
@@ -144,7 +144,7 @@ public:
        operator[](std::size_t index) const
        {
                if (index >= ContainerOperations::size(_container)) {
-                       LTTNG_THROW_INVALID_ARGUMENT_ERROR(fmt::format(
+                       LTTNG_THROW_INVALID_ARGUMENT_ERROR(lttng::format(
                                "Out of bound access through random_access_container_wrapper: index={}, size={}",
                                index,
                                size()));