mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-07 17:44:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

build(icc): fix nodiscard attribute handling

Browse Source
This commit is contained in:
Alexander Alekhin 2021-10-28 05:49:05 +00:00
parent 5dfe65d53a
commit 1726bb6c0d
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/include/opencv2/core/cvdef.h
View File

@ -589,6 +589,8 @@ Cv64suf;
# elif __cplusplus >= 201703L # elif __cplusplus >= 201703L
// available when compiler is C++17 compliant // available when compiler is C++17 compliant
# define CV_NODISCARD_STD [[nodiscard]] # define CV_NODISCARD_STD [[nodiscard]]
# elif defined(__INTEL_COMPILER)
// see above, available when C++17 is enabled
# elif defined(_MSC_VER) && _MSC_VER >= 1911 && _MSVC_LANG >= 201703L # elif defined(_MSC_VER) && _MSC_VER >= 1911 && _MSVC_LANG >= 201703L
// available with VS2017 v15.3+ with /std:c++17 or higher; works on functions and classes // available with VS2017 v15.3+ with /std:c++17 or higher; works on functions and classes
# define CV_NODISCARD_STD [[nodiscard]] # define CV_NODISCARD_STD [[nodiscard]]