Skip to content

Commit

Permalink
iox-eclipse-iceoryx#1750 Remove legacy 'f_' prefix
Browse files Browse the repository at this point in the history
Signed-off-by: Simon Hoinkis <[email protected]>
  • Loading branch information
mossmaurice committed Oct 25, 2022
1 parent 8f6af2f commit 889ccea
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion iceoryx_hoofs/include/iceoryx_hoofs/cxx/expected.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ class IOX_NO_DISCARD expected<ValueType, ErrorType>
optional<ValueType> to_optional() const noexcept;

private:
explicit expected(variant<ValueType, ErrorType>&& f_store) noexcept;
explicit expected(variant<ValueType, ErrorType>&& store) noexcept;
variant<ValueType, ErrorType> m_store;
static constexpr uint64_t VALUE_INDEX = 0U;
static constexpr uint64_t ERROR_INDEX = 1U;
Expand Down
8 changes: 4 additions & 4 deletions iceoryx_hoofs/include/iceoryx_hoofs/internal/cxx/expected.inl
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ inline error<T>::error(Targs&&... args) noexcept


template <typename ValueType, typename ErrorType>
inline expected<ValueType, ErrorType>::expected(variant<ValueType, ErrorType>&& f_store) noexcept
: m_store(std::move(f_store))
inline expected<ValueType, ErrorType>::expected(variant<ValueType, ErrorType>&& store) noexcept
: m_store(std::move(store))
{
}

Expand Down Expand Up @@ -240,8 +240,8 @@ inline optional<ValueType> expected<ValueType, ErrorType>::to_optional() const n
}

template <typename ErrorType>
inline expected<ErrorType>::expected(variant<ErrorType>&& f_store) noexcept
: m_store(std::move(f_store))
inline expected<ErrorType>::expected(variant<ErrorType>&& store) noexcept
: m_store(std::move(store))
{
}

Expand Down

0 comments on commit 889ccea

Please sign in to comment.