Skip to content

Commit

Permalink
iox-#220 replace [[gnu::deprecated]] with the standard [[deprecated]]…
Browse files Browse the repository at this point in the history
… attribute

Signed-off-by: Mathias Kraus <[email protected]>
  • Loading branch information
elBoberido committed Nov 23, 2020
1 parent 7bed881 commit 652f76a
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion iceoryx_posh/include/iceoryx_posh/roudi/roudi_app.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class RouDiApp
static RouDiConfig_t generateConfigFromMePooConfig(const mepoo::MePooConfig* mePooConfig) noexcept;

/// @deprecated Please port to RouDiApp(const CmdLineParser&, const RouDiConfig_T&)
[[gnu::deprecated]] RouDiApp(int argc, char* argv[], const mepoo::MePooConfig* mePooConfig = nullptr) noexcept;
[[deprecated]] RouDiApp(int argc, char* argv[], const mepoo::MePooConfig* mePooConfig = nullptr) noexcept;

/// @deprecated Will be deprecated soon, please port to RouDiApp(const CmdLineParser&, const RouDiConfig_T&)
RouDiApp(int argc, char* argv[], const RouDiConfig_t& config) noexcept;
Expand Down
44 changes: 22 additions & 22 deletions iceoryx_utils/include/iceoryx_utils/cxx/expected.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ class expected<ErrorType>
/// std::cout << "error occured : " << result.get_error() << std::endl;
/// })
/// @endcode
[[gnu::deprecated]] const expected& on_error(const cxx::function_ref<void(expected&)>& callable) const noexcept;
[[deprecated]] const expected& on_error(const cxx::function_ref<void(expected&)>& callable) const noexcept;

/// @brief if the expected does contain an error the given callable is called and
/// a reference to the expected is given as an argument to the callable
Expand All @@ -266,7 +266,7 @@ class expected<ErrorType>
/// std::cout << "error occured : " << result.get_error() << std::endl;
/// })
/// @endcode
[[gnu::deprecated]] expected& on_error(const cxx::function_ref<void(expected&)>& callable) noexcept;
[[deprecated]] expected& on_error(const cxx::function_ref<void(expected&)>& callable) noexcept;

/// @brief if the expected does contain an error the given callable is called and
/// a reference to the ErrorType is given as an argument to the callable
Expand All @@ -277,7 +277,7 @@ class expected<ErrorType>
/// std::cout << "error occured : " << error << std::endl;
/// })
/// @endcode
[[gnu::deprecated]] const expected& on_error(const cxx::function_ref<void(ErrorType&)>& callable) const noexcept;
[[deprecated]] const expected& on_error(const cxx::function_ref<void(ErrorType&)>& callable) const noexcept;
const expected& or_else(const cxx::function_ref<void(ErrorType&)>& callable) const noexcept;

/// @brief if the expected does contain an error the given callable is called and
Expand All @@ -289,7 +289,7 @@ class expected<ErrorType>
/// std::cout << "error occured : " << error << std::endl;
/// })
/// @endcode
[[gnu::deprecated]] expected& on_error(const cxx::function_ref<void(ErrorType&)>& callable) noexcept;
[[deprecated]] expected& on_error(const cxx::function_ref<void(ErrorType&)>& callable) noexcept;
expected& or_else(const cxx::function_ref<void(ErrorType&)>& callable) noexcept;

/// @brief if the expected does contain an error the given callable is called
Expand All @@ -300,7 +300,7 @@ class expected<ErrorType>
/// std::cout << "error occured " << std::endl;
/// })
/// @endcode
[[gnu::deprecated]] const expected& on_error(const cxx::function_ref<void()>& callable) const noexcept;
[[deprecated]] const expected& on_error(const cxx::function_ref<void()>& callable) const noexcept;

/// @brief if the expected does contain an error the given callable is called
/// @param[in] callable callable which will be called if the expected contains an error
Expand All @@ -310,7 +310,7 @@ class expected<ErrorType>
/// std::cout << "error occured " << std::endl;
/// })
/// @endcode
[[gnu::deprecated]] expected& on_error(const cxx::function_ref<void()>& callable) noexcept;
[[deprecated]] expected& on_error(const cxx::function_ref<void()>& callable) noexcept;

/// @brief if the expected does contain a success value the given callable is called and
/// a reference to the expected is given as an argument to the callable
Expand All @@ -321,7 +321,7 @@ class expected<ErrorType>
/// std::cout << "we are successful" << std::endl;
/// })
/// @endcode
[[gnu::deprecated]] const expected& on_success(const cxx::function_ref<void(expected&)>& callable) const noexcept;
[[deprecated]] const expected& on_success(const cxx::function_ref<void(expected&)>& callable) const noexcept;

/// @brief if the expected does contain a success value the given callable is called and
/// a reference to the expected is given as an argument to the callable
Expand All @@ -332,7 +332,7 @@ class expected<ErrorType>
/// std::cout << "we are successful" << std::endl;
/// })
/// @endcode
[[gnu::deprecated]] expected& on_success(const cxx::function_ref<void(expected&)>& callable) noexcept;
[[deprecated]] expected& on_success(const cxx::function_ref<void(expected&)>& callable) noexcept;

/// @brief if the expected does contain a success value the given callable is called and
/// a reference to the expected is given as an argument to the callable
Expand All @@ -343,7 +343,7 @@ class expected<ErrorType>
/// std::cout << "we are successful!" << std::endl;
/// })
/// @endcode
[[gnu::deprecated]] const expected& on_success(const cxx::function_ref<void()>& callable) const noexcept;
[[deprecated]] const expected& on_success(const cxx::function_ref<void()>& callable) const noexcept;
const expected& and_then(const cxx::function_ref<void()>& callable) const noexcept;

/// @brief if the expected does contain a success value the given callable is called and
Expand All @@ -355,7 +355,7 @@ class expected<ErrorType>
/// std::cout << "we are successful!" << std::endl;
/// })
/// @endcode
[[gnu::deprecated]] expected& on_success(const cxx::function_ref<void()>& callable) noexcept;
[[deprecated]] expected& on_success(const cxx::function_ref<void()>& callable) noexcept;
expected& and_then(const cxx::function_ref<void()>& callable) noexcept;

private:
Expand Down Expand Up @@ -566,7 +566,7 @@ class expected<ValueType, ErrorType>
/// std::cout << "error occured : " << result.get_error() << std::endl;
/// })
/// @endcode
[[gnu::deprecated]] const expected& on_error(const cxx::function_ref<void(expected&)>& callable) const noexcept;
[[deprecated]] const expected& on_error(const cxx::function_ref<void(expected&)>& callable) const noexcept;

/// @brief if the expected does contain an error the given callable is called and
/// a reference to the expected is given as an argument to the callable
Expand All @@ -577,7 +577,7 @@ class expected<ValueType, ErrorType>
/// std::cout << "error occured : " << result.get_error() << std::endl;
/// })
/// @endcode
[[gnu::deprecated]] expected& on_error(const cxx::function_ref<void(expected&)>& callable) noexcept;
[[deprecated]] expected& on_error(const cxx::function_ref<void(expected&)>& callable) noexcept;

/// @brief if the expected does contain an error the given callable is called and
/// a reference to the ErrorType is given as an argument to the callable
Expand All @@ -588,7 +588,7 @@ class expected<ValueType, ErrorType>
/// std::cout << "error occured : " << error << std::endl;
/// })
/// @endcode
[[gnu::deprecated]] const expected& on_error(const cxx::function_ref<void(ErrorType&)>& callable) const noexcept;
[[deprecated]] const expected& on_error(const cxx::function_ref<void(ErrorType&)>& callable) const noexcept;
const expected& or_else(const cxx::function_ref<void(ErrorType&)>& callable) const noexcept;

/// @brief if the expected does contain an error the given callable is called and
Expand All @@ -600,7 +600,7 @@ class expected<ValueType, ErrorType>
/// std::cout << "error occured : " << error << std::endl;
/// })
/// @endcode
[[gnu::deprecated]] expected& on_error(const cxx::function_ref<void(ErrorType&)>& callable) noexcept;
[[deprecated]] expected& on_error(const cxx::function_ref<void(ErrorType&)>& callable) noexcept;
expected& or_else(const cxx::function_ref<void(ErrorType&)>& callable) noexcept;

/// @brief if the expected does contain an error the given callable is called
Expand All @@ -611,7 +611,7 @@ class expected<ValueType, ErrorType>
/// std::cout << "error occured " << std::endl;
/// })
/// @endcode
[[gnu::deprecated]] const expected& on_error(const cxx::function_ref<void()>& callable) const noexcept;
[[deprecated]] const expected& on_error(const cxx::function_ref<void()>& callable) const noexcept;

/// @brief if the expected does contain an error the given callable is called
/// @param[in] callable callable which will be called if the expected contains an error
Expand All @@ -621,7 +621,7 @@ class expected<ValueType, ErrorType>
/// std::cout << "error occured " << std::endl;
/// })
/// @endcode
[[gnu::deprecated]] expected& on_error(const cxx::function_ref<void()>& callable) noexcept;
[[deprecated]] expected& on_error(const cxx::function_ref<void()>& callable) noexcept;

/// @brief if the expected does contain a success value the given callable is called and
/// a reference to the expected is given as an argument to the callable
Expand All @@ -632,7 +632,7 @@ class expected<ValueType, ErrorType>
/// std::cout << "we have a result : " << result.get_value() << std::endl;
/// })
/// @endcode
[[gnu::deprecated]] const expected& on_success(const cxx::function_ref<void(expected&)>& callable) const noexcept;
[[deprecated]] const expected& on_success(const cxx::function_ref<void(expected&)>& callable) const noexcept;

/// @brief if the expected does contain a success value the given callable is called and
/// a reference to the expected is given as an argument to the callable
Expand All @@ -643,7 +643,7 @@ class expected<ValueType, ErrorType>
/// std::cout << "we have a result : " << result.get_value() << std::endl;
/// })
/// @endcode
[[gnu::deprecated]] expected& on_success(const cxx::function_ref<void(expected&)>& callable) noexcept;
[[deprecated]] expected& on_success(const cxx::function_ref<void(expected&)>& callable) noexcept;

/// @brief if the expected does contain a success value the given callable is called and
/// a reference to the result is given as an argument to the callable
Expand All @@ -654,7 +654,7 @@ class expected<ValueType, ErrorType>
/// std::cout << "we have a result : " << result << std::endl;
/// })
/// @endcode
[[gnu::deprecated]] const expected& on_success(const cxx::function_ref<void(ValueType&)>& callable) const noexcept;
[[deprecated]] const expected& on_success(const cxx::function_ref<void(ValueType&)>& callable) const noexcept;
const expected& and_then(const cxx::function_ref<void(ValueType&)>& callable) const noexcept;

/// @brief if the expected does contain a success value the given callable is called and
Expand All @@ -666,7 +666,7 @@ class expected<ValueType, ErrorType>
/// std::cout << "we have a result : " << result << std::endl;
/// })
/// @endcode
[[gnu::deprecated]] expected& on_success(const cxx::function_ref<void(ValueType&)>& callable) noexcept;
[[deprecated]] expected& on_success(const cxx::function_ref<void(ValueType&)>& callable) noexcept;
expected& and_then(const cxx::function_ref<void(ValueType&)>& callable) noexcept;

///
Expand Down Expand Up @@ -706,7 +706,7 @@ class expected<ValueType, ErrorType>
/// std::cout << "we are successful!" << std::endl;
/// })
/// @endcode
[[gnu::deprecated]] const expected& on_success(const cxx::function_ref<void()>& callable) const noexcept;
[[deprecated]] const expected& on_success(const cxx::function_ref<void()>& callable) const noexcept;

/// @brief if the expected does contain a success value the given callable is called and
/// a reference to the expected is given as an argument to the callable
Expand All @@ -717,7 +717,7 @@ class expected<ValueType, ErrorType>
/// std::cout << "we are successful!" << std::endl;
/// })
/// @endcode
[[gnu::deprecated]] expected& on_success(const cxx::function_ref<void()>& callable) noexcept;
[[deprecated]] expected& on_success(const cxx::function_ref<void()>& callable) noexcept;

///
/// @brief if the expected contains a success value and its type is an empty optional, calls the provided callable
Expand Down

0 comments on commit 652f76a

Please sign in to comment.