waiter: modernize the waiter interface

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

diff --git a/src/common/container-wrapper.hpp b/src/common/container-wrapper.hpp
index c2c59f89da06f07595d5c7cd262dfbc3fcbdde35..7f9678d08d3cb8252de645bd3731434d73b4e52a 100644 (file)
--- a/src/common/container-wrapper.hpp
+++ b/src/common/container-wrapper.hpp
@@ -130,7 +130,7 @@ public:
                 *
                 * For more information, see Item 3 of Effective C++.
                 */
-               const auto& const_this = static_cast<const decltype(*this)&>(*this);
+               const auto& const_this = static_cast<const random_access_container_wrapper&>(*this);
 
                /* NOLINTNEXTLINE(cppcoreguidelines-pro-type-const-cast) */
                return const_cast<typename std::conditional<std::is_pointer<ElementType>::value,
@@ -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()));