Chiebot-Mirror
/
opencv
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build(icc): fix nodiscard attribute handling

Browse Source
pull/20960/head
Alexander Alekhin 4 years ago
parent 5dfe65d53a
commit 1726bb6c0d
1 changed files with 2 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      modules/core/include/opencv2/core/cvdef.h

2
modules/core/include/opencv2/core/cvdef.h
Unescape 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]]

Write Preview
Loading…
Cancel
Save