X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Fcontainer-wrapper.hpp;h=7f9678d08d3cb8252de645bd3731434d73b4e52a;hb=74021af62434d042d27e010d62d6b6a0717f246b;hp=5ee20dfeab3b2b3f92d94539ddf25dd156fae0e1;hpb=feef6f74e701ea68540ca306628888c1cf4f01bd;p=lttng-tools.git

diff --git a/src/common/container-wrapper.hpp b/src/common/container-wrapper.hpp
index 5ee20dfea..7f9678d08 100644
--- 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);
 	}
@@ -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()));