feedc0de/GSL
1
0
Fork 0
forked from microsoft/GSL
Code Pull Requests Activity

Merge pull request #908 from JordanMaples/fix_nodiscard_in_finally_macro

Browse Source 
Finally [[nodiscard]] - Version 2
This commit is contained in:
Jordan Maples [MSFT]
2020-08-12 15:49:55 -07:00
committed by GitHub
parent ef714fa49e afe824490e
commit 0c80f51f7c
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/gsl/gsl_util
View File

@@ -32,6 +32,12 @@
#endif // _MSC_VER
#if defined(__cplusplus) && (__cplusplus >= 201703L)
#define GSL_NODISCARD [[nodiscard]]
#else
#define GSL_NODISCARD
#endif // defined(__cplusplus) && (__cplusplus >= 201703L)
namespace gsl
{
//
@@ -67,13 +73,13 @@ private:
// finally() - convenience function to generate a final_action
template <class F>
final_action<F> finally(const F& f) noexcept
GSL_NODISCARD final_action<F> finally(const F& f) noexcept
{
return final_action<F>(f);
}
template <class F>
final_action<F> finally(F&& f) noexcept
GSL_NODISCARD final_action<F> finally(F&& f) noexcept
{
return final_action<F>(std::forward<F>(f));
}