third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: eliminate calls of removed functionality from C++17

Browse Source 
Most part is deprecated since C++11
This commit is contained in:
Alexander Alekhin
2018-02-06 19:05:34 +03:00
parent f77f2876ff
commit 44d7435a48
11 changed files with 63 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/ts/include/opencv2/ts/ts_perf.hpp
+10 -4
View File
@@ -707,8 +707,11 @@ namespace comparators
{
template<typename T>
struct RectLess_ :
public std::binary_function<cv::Rect_<T>, cv::Rect_<T>, bool>
#ifdef CV_CXX11
struct RectLess_
#else
struct RectLess_ : public std::binary_function<cv::Rect_<T>, cv::Rect_<T>, bool>
#endif
{
bool operator()(const cv::Rect_<T>& r1, const cv::Rect_<T>& r2) const
{
@@ -721,8 +724,11 @@ struct RectLess_ :
typedef RectLess_<int> RectLess;
struct KeypointGreater :
public std::binary_function<cv::KeyPoint, cv::KeyPoint, bool>
#ifdef CV_CXX11
struct KeypointGreater
#else
struct KeypointGreater : public std::binary_function<cv::KeyPoint, cv::KeyPoint, bool>
#endif
{
bool operator()(const cv::KeyPoint& kp1, const cv::KeyPoint& kp2) const
{