From 0355ec32eb57a862b5aee45ab323c7cd994d66d3 Mon Sep 17 00:00:00 2001 From: Simon Hoinkis Date: Tue, 18 Oct 2022 17:11:16 +0200 Subject: [PATCH] iox-#1750 Remove legacy 'f_' prefix Signed-off-by: Simon Hoinkis --- iceoryx_hoofs/include/iceoryx_hoofs/cxx/expected.hpp | 2 +- .../include/iceoryx_hoofs/internal/cxx/expected.inl | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/iceoryx_hoofs/include/iceoryx_hoofs/cxx/expected.hpp b/iceoryx_hoofs/include/iceoryx_hoofs/cxx/expected.hpp index aa67896275b..f369a203da9 100644 --- a/iceoryx_hoofs/include/iceoryx_hoofs/cxx/expected.hpp +++ b/iceoryx_hoofs/include/iceoryx_hoofs/cxx/expected.hpp @@ -440,7 +440,7 @@ class IOX_NO_DISCARD expected optional to_optional() const noexcept; private: - explicit expected(variant&& f_store) noexcept; + explicit expected(variant&& store) noexcept; variant m_store; static constexpr uint64_t VALUE_INDEX = 0U; static constexpr uint64_t ERROR_INDEX = 1U; diff --git a/iceoryx_hoofs/include/iceoryx_hoofs/internal/cxx/expected.inl b/iceoryx_hoofs/include/iceoryx_hoofs/internal/cxx/expected.inl index f265065bbcf..3b0e191d1e5 100644 --- a/iceoryx_hoofs/include/iceoryx_hoofs/internal/cxx/expected.inl +++ b/iceoryx_hoofs/include/iceoryx_hoofs/internal/cxx/expected.inl @@ -75,8 +75,8 @@ inline error::error(Targs&&... args) noexcept template -inline expected::expected(variant&& f_store) noexcept - : m_store(std::move(f_store)) +inline expected::expected(variant&& store) noexcept + : m_store(std::move(store)) { } @@ -240,8 +240,8 @@ inline optional expected::to_optional() const n } template -inline expected::expected(variant&& f_store) noexcept - : m_store(std::move(f_store)) +inline expected::expected(variant&& store) noexcept + : m_store(std::move(store)) { }