Chiebot-Mirror
/
opencv
mirror of https://github.com/opencv/opencv.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #18924 from alalek:4.x-xcode12

Browse Source 
(4.x) build: Xcode 12 support

* build: xcode 12 support, cmake fixes

* ts: eliminate clang 11 warnigns

* 3rdparty: clang 11 warnings

* features2d: eliminate build warnings

* test: warnings

* gapi: warnings from 18928
pull/18936/head
Alexander Alekhin 4 years ago committed by GitHub
parent 3c9d03c36f
commit 5c987e4c75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 115 additions and 104 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      3rdparty/openexr/CMakeLists.txt
  2. 4
      3rdparty/openjpeg/CMakeLists.txt
  3. 2
      cmake/OpenCVCompilerOptions.cmake
  4. 36
      cmake/OpenCVFindLibsGrfmt.cmake
  5. 2
      modules/core/test/test_math.cpp
  6. 2
      modules/features2d/src/evaluation.cpp
  7. 2
      modules/features2d/src/keypoint.cpp
  8. 4
      modules/gapi/CMakeLists.txt
  9. 162
      modules/ts/include/opencv2/ts/ts_gtest.h
  10. 2
      modules/ts/src/ts_perf.cpp
  11. 2
      platforms/ios/build_framework.py

1
3rdparty/openexr/CMakeLists.txt vendored
Unescape View File

@ -109,6 +109,7 @@ ocv_warnings_disable(CMAKE_CXX_FLAGS -Wshadow -Wunused -Wsign-compare -Wundef -W
-Wmissing-prototypes # gcc/clang
-Wreorder
-Wunused-result
-Wimplicit-const-int-float-conversion # clang
)
if(CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 8.0)
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wclass-memaccess)

4
3rdparty/openjpeg/CMakeLists.txt vendored
Unescape View File

@ -11,6 +11,10 @@ set(OPENJPEG_LIBRARY_NAME libopenjp2)
project(openjpeg C)
ocv_warnings_disable(CMAKE_C_FLAGS
-Wimplicit-const-int-float-conversion # clang
)
#-----------------------------------------------------------------------------
# OPENJPEG version number, useful for packaging and doxygen doc:
set(OPENJPEG_VERSION_MAJOR 2)

2
cmake/OpenCVCompilerOptions.cmake
Unescape View File

@ -153,7 +153,7 @@ if(CV_GCC OR CV_CLANG)
if(CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
add_extra_compiler_option(-Wno-missing-field-initializers) # GCC 4.x emits warnings about {}, fixed in GCC 5+
endif()
if(CV_CLANG AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.0)
if(CV_CLANG AND NOT CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.0)
add_extra_compiler_option(-Wno-deprecated-enum-enum-conversion)
add_extra_compiler_option(-Wno-deprecated-anon-enum-enum-conversion)
endif()

36
cmake/OpenCVFindLibsGrfmt.cmake
Unescape View File

@ -15,11 +15,12 @@ else()
endif()
if(NOT ZLIB_FOUND)
ocv_clear_vars(ZLIB_LIBRARY ZLIB_LIBRARIES ZLIB_INCLUDE_DIRS)
ocv_clear_vars(ZLIB_LIBRARY ZLIB_LIBRARIES ZLIB_INCLUDE_DIR)
set(ZLIB_LIBRARY zlib)
set(ZLIB_LIBRARY zlib CACHE INTERNAL "")
add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/zlib")
set(ZLIB_INCLUDE_DIRS "${${ZLIB_LIBRARY}_SOURCE_DIR}" "${${ZLIB_LIBRARY}_BINARY_DIR}")
set(ZLIB_INCLUDE_DIR "${${ZLIB_LIBRARY}_SOURCE_DIR}" "${${ZLIB_LIBRARY}_BINARY_DIR}" CACHE INTERNAL "")
set(ZLIB_INCLUDE_DIRS ${ZLIB_INCLUDE_DIR})
set(ZLIB_LIBRARIES ${ZLIB_LIBRARY})
ocv_parse_header2(ZLIB "${${ZLIB_LIBRARY}_SOURCE_DIR}/zlib.h" ZLIB_VERSION)
@ -37,16 +38,17 @@ if(WITH_JPEG)
ocv_clear_vars(JPEG_LIBRARY JPEG_LIBRARIES JPEG_INCLUDE_DIR)
if(NOT BUILD_JPEG_TURBO_DISABLE)
set(JPEG_LIBRARY libjpeg-turbo)
set(JPEG_LIBRARY libjpeg-turbo CACHE INTERNAL "")
set(JPEG_LIBRARIES ${JPEG_LIBRARY})
add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/libjpeg-turbo")
set(JPEG_INCLUDE_DIR "${${JPEG_LIBRARY}_SOURCE_DIR}/src")
set(JPEG_INCLUDE_DIR "${${JPEG_LIBRARY}_SOURCE_DIR}/src" CACHE INTERNAL "")
else()
set(JPEG_LIBRARY libjpeg)
set(JPEG_LIBRARY libjpeg CACHE INTERNAL "")
set(JPEG_LIBRARIES ${JPEG_LIBRARY})
add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/libjpeg")
set(JPEG_INCLUDE_DIR "${${JPEG_LIBRARY}_SOURCE_DIR}")
set(JPEG_INCLUDE_DIR "${${JPEG_LIBRARY}_SOURCE_DIR}" CACHE INTERNAL "")
endif()
set(JPEG_INCLUDE_DIRS "${JPEG_INCLUDE_DIR}")
endif()
macro(ocv_detect_jpeg_version header_file)
@ -83,10 +85,10 @@ if(WITH_TIFF)
if(NOT TIFF_FOUND)
ocv_clear_vars(TIFF_LIBRARY TIFF_LIBRARIES TIFF_INCLUDE_DIR)
set(TIFF_LIBRARY libtiff)
set(TIFF_LIBRARY libtiff CACHE INTERNAL "")
set(TIFF_LIBRARIES ${TIFF_LIBRARY})
add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/libtiff")
set(TIFF_INCLUDE_DIR "${${TIFF_LIBRARY}_SOURCE_DIR}" "${${TIFF_LIBRARY}_BINARY_DIR}")
set(TIFF_INCLUDE_DIR "${${TIFF_LIBRARY}_SOURCE_DIR}" "${${TIFF_LIBRARY}_BINARY_DIR}" CACHE INTERNAL "")
ocv_parse_header("${${TIFF_LIBRARY}_SOURCE_DIR}/tiff.h" TIFF_VERSION_LINES TIFF_VERSION_CLASSIC TIFF_VERSION_BIG TIFF_VERSION TIFF_BIGTIFF_VERSION)
endif()
@ -128,12 +130,12 @@ endif()
if(WITH_WEBP AND NOT WEBP_FOUND
AND (NOT ANDROID OR HAVE_CPUFEATURES)
)
set(WEBP_LIBRARY libwebp)
ocv_clear_vars(WEBP_LIBRARY WEBP_INCLUDE_DIR)
set(WEBP_LIBRARY libwebp CACHE INTERNAL "")
set(WEBP_LIBRARIES ${WEBP_LIBRARY})
add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/libwebp")
set(WEBP_INCLUDE_DIR "${${WEBP_LIBRARY}_SOURCE_DIR}/src")
set(WEBP_INCLUDE_DIR "${${WEBP_LIBRARY}_SOURCE_DIR}/src" CACHE INTERNAL "")
set(HAVE_WEBP 1)
endif()
@ -192,10 +194,10 @@ if(WITH_JASPER AND NOT HAVE_OPENJPEG)
if(NOT JASPER_FOUND)
ocv_clear_vars(JASPER_LIBRARY JASPER_LIBRARIES JASPER_INCLUDE_DIR)
set(JASPER_LIBRARY libjasper)
set(JASPER_LIBRARY libjasper CACHE INTERNAL "")
set(JASPER_LIBRARIES ${JASPER_LIBRARY})
add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/libjasper")
set(JASPER_INCLUDE_DIR "${${JASPER_LIBRARY}_SOURCE_DIR}")
set(JASPER_INCLUDE_DIR "${${JASPER_LIBRARY}_SOURCE_DIR}" CACHE INTERNAL "")
endif()
set(HAVE_JASPER YES)
@ -225,10 +227,10 @@ if(WITH_PNG)
if(NOT PNG_FOUND)
ocv_clear_vars(PNG_LIBRARY PNG_LIBRARIES PNG_INCLUDE_DIR PNG_PNG_INCLUDE_DIR HAVE_LIBPNG_PNG_H PNG_DEFINITIONS)
set(PNG_LIBRARY libpng)
set(PNG_LIBRARY libpng CACHE INTERNAL "")
set(PNG_LIBRARIES ${PNG_LIBRARY})
add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/libpng")
set(PNG_INCLUDE_DIR "${${PNG_LIBRARY}_SOURCE_DIR}")
set(PNG_INCLUDE_DIR "${${PNG_LIBRARY}_SOURCE_DIR}" CACHE INTERNAL "")
set(PNG_DEFINITIONS "")
ocv_parse_header("${PNG_INCLUDE_DIR}/png.h" PNG_VERSION_LINES PNG_LIBPNG_VER_MAJOR PNG_LIBPNG_VER_MINOR PNG_LIBPNG_VER_RELEASE)
endif()
@ -270,7 +272,7 @@ if(WITH_GDAL)
endif()
endif()
if (WITH_GDCM)
if(WITH_GDCM)
find_package(GDCM QUIET)
if(NOT GDCM_FOUND)
set(HAVE_GDCM NO)

2
modules/core/test/test_math.cpp
Unescape View File

@ -2579,7 +2579,7 @@ TEST(Core_CheckRange_INT_MAX, accuracy)
TEST(Core_CheckRange_INT_MAX1, accuracy)
{
cv::Mat m(3, 3, CV_32SC1, cv::Scalar(INT_MAX));
ASSERT_TRUE( cv::checkRange(m, true, 0, 0, INT_MAX+1.0f) );
ASSERT_TRUE( cv::checkRange(m, true, 0, 0, (float)((double)INT_MAX+1.0f)) );
ASSERT_TRUE( cv::checkRange(m) );
}

2
modules/features2d/src/evaluation.cpp
Unescape View File

@ -314,7 +314,7 @@ struct SIdx
UsedFinder(const SIdx& _used) : used(_used) {}
const SIdx& used;
bool operator()(const SIdx& v) const { return (v.i1 == used.i1 || v.i2 == used.i2); }
UsedFinder& operator=(const UsedFinder&);
UsedFinder& operator=(const UsedFinder&) = delete;
};
};

2
modules/features2d/src/keypoint.cpp
Unescape View File

@ -151,7 +151,7 @@ public:
private:
const Mat mask;
MaskPredicate& operator=(const MaskPredicate&);
MaskPredicate& operator=(const MaskPredicate&) = delete;
};
void KeyPointsFilter::runByPixelsMask( std::vector<KeyPoint>& keypoints, const Mat& mask )

4
modules/gapi/CMakeLists.txt
Unescape View File

@ -38,6 +38,10 @@ if(MSVC)
endif()
endif()
if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang") # don't add Clang here: issue should be investigated and fixed (workaround for Apple only)
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wrange-loop-analysis) # https://github.com/opencv/opencv/issues/18928
endif()
file(GLOB gapi_ext_hdrs
"${CMAKE_CURRENT_LIST_DIR}/include/opencv2/*.hpp"
"${CMAKE_CURRENT_LIST_DIR}/include/opencv2/${name}/*.hpp"

162
modules/ts/include/opencv2/ts/ts_gtest.h
Unescape View File

@ -9795,7 +9795,7 @@ class GTEST_API_ ExitedWithCode {
bool operator()(int exit_status) const;
private:
// No implementation - assignment is unsupported.
void operator=(const ExitedWithCode& other);
void operator=(const ExitedWithCode& other) = delete;
const int exit_code_;
};
@ -11769,7 +11769,7 @@ class RangeGenerator : public ParamGeneratorInterface<T> {
step_(other.step_) {}
// No implementation - assignment is unsupported.
void operator=(const Iterator& other);
void operator=(const Iterator& other) = delete;
const ParamGeneratorInterface<T>* const base_;
T value_;
@ -11787,7 +11787,7 @@ class RangeGenerator : public ParamGeneratorInterface<T> {
}
// No implementation - assignment is unsupported.
void operator=(const RangeGenerator& other);
void operator=(const RangeGenerator& other) = delete;
const T begin_;
const T end_;
@ -11878,7 +11878,7 @@ class ValuesInIteratorRangeGenerator : public ParamGeneratorInterface<T> {
}; // class ValuesInIteratorRangeGenerator::Iterator
// No implementation - assignment is unsupported.
void operator=(const ValuesInIteratorRangeGenerator& other);
void operator=(const ValuesInIteratorRangeGenerator& other) = delete;
const ContainerType container_;
}; // class ValuesInIteratorRangeGenerator
@ -12329,7 +12329,7 @@ class ValueArray1 {
private:
// No implementation - assignment is unsupported.
void operator=(const ValueArray1& other);
void operator=(const ValueArray1& other) = delete;
const T1 v1_;
};
@ -12349,7 +12349,7 @@ class ValueArray2 {
private:
// No implementation - assignment is unsupported.
void operator=(const ValueArray2& other);
void operator=(const ValueArray2& other) = delete;
const T1 v1_;
const T2 v2_;
@ -12372,7 +12372,7 @@ class ValueArray3 {
private:
// No implementation - assignment is unsupported.
void operator=(const ValueArray3& other);
void operator=(const ValueArray3& other) = delete;
const T1 v1_;
const T2 v2_;
@ -12397,7 +12397,7 @@ class ValueArray4 {
private:
// No implementation - assignment is unsupported.
void operator=(const ValueArray4& other);
void operator=(const ValueArray4& other) = delete;
const T1 v1_;
const T2 v2_;
@ -12423,7 +12423,7 @@ class ValueArray5 {
private:
// No implementation - assignment is unsupported.
void operator=(const ValueArray5& other);
void operator=(const ValueArray5& other) = delete;
const T1 v1_;
const T2 v2_;
@ -12452,7 +12452,7 @@ class ValueArray6 {
private:
// No implementation - assignment is unsupported.
void operator=(const ValueArray6& other);
void operator=(const ValueArray6& other) = delete;
const T1 v1_;
const T2 v2_;
@ -12483,7 +12483,7 @@ class ValueArray7 {
private:
// No implementation - assignment is unsupported.
void operator=(const ValueArray7& other);
void operator=(const ValueArray7& other) = delete;
const T1 v1_;
const T2 v2_;
@ -12516,7 +12516,7 @@ class ValueArray8 {
private:
// No implementation - assignment is unsupported.
void operator=(const ValueArray8& other);
void operator=(const ValueArray8& other) = delete;
const T1 v1_;
const T2 v2_;
@ -12551,7 +12551,7 @@ class ValueArray9 {
private:
// No implementation - assignment is unsupported.
void operator=(const ValueArray9& other);
void operator=(const ValueArray9& other) = delete;
const T1 v1_;
const T2 v2_;
@ -12587,7 +12587,7 @@ class ValueArray10 {
private:
// No implementation - assignment is unsupported.
void operator=(const ValueArray10& other);
void operator=(const ValueArray10& other) = delete;
const T1 v1_;
const T2 v2_;
@ -12626,7 +12626,7 @@ class ValueArray11 {
private:
// No implementation - assignment is unsupported.
void operator=(const ValueArray11& other);
void operator=(const ValueArray11& other) = delete;
const T1 v1_;
const T2 v2_;
@ -12667,7 +12667,7 @@ class ValueArray12 {
private:
// No implementation - assignment is unsupported.
void operator=(const ValueArray12& other);
void operator=(const ValueArray12& other) = delete;
const T1 v1_;
const T2 v2_;
@ -12710,7 +12710,7 @@ class ValueArray13 {
private:
// No implementation - assignment is unsupported.
void operator=(const ValueArray13& other);
void operator=(const ValueArray13& other) = delete;
const T1 v1_;
const T2 v2_;
@ -12754,7 +12754,7 @@ class ValueArray14 {
private:
// No implementation - assignment is unsupported.
void operator=(const ValueArray14& other);
void operator=(const ValueArray14& other) = delete;
const T1 v1_;
const T2 v2_;
@ -12801,7 +12801,7 @@ class ValueArray15 {
private:
// No implementation - assignment is unsupported.
void operator=(const ValueArray15& other);
void operator=(const ValueArray15& other) = delete;
const T1 v1_;
const T2 v2_;
@ -12851,7 +12851,7 @@ class ValueArray16 {
private:
// No implementation - assignment is unsupported.
void operator=(const ValueArray16& other);
void operator=(const ValueArray16& other) = delete;
const T1 v1_;
const T2 v2_;
@ -12902,7 +12902,7 @@ class ValueArray17 {
private:
// No implementation - assignment is unsupported.
void operator=(const ValueArray17& other);
void operator=(const ValueArray17& other) = delete;
const T1 v1_;
const T2 v2_;
@ -12955,7 +12955,7 @@ class ValueArray18 {
private:
// No implementation - assignment is unsupported.
void operator=(const ValueArray18& other);
void operator=(const ValueArray18& other) = delete;
const T1 v1_;
const T2 v2_;
@ -13010,7 +13010,7 @@ class ValueArray19 {
private:
// No implementation - assignment is unsupported.
void operator=(const ValueArray19& other);
void operator=(const ValueArray19& other) = delete;
const T1 v1_;
const T2 v2_;
@ -13067,7 +13067,7 @@ class ValueArray20 {
private:
// No implementation - assignment is unsupported.
void operator=(const ValueArray20& other);
void operator=(const ValueArray20& other) = delete;
const T1 v1_;
const T2 v2_;
@ -13127,7 +13127,7 @@ class ValueArray21 {
private:
// No implementation - assignment is unsupported.
void operator=(const ValueArray21& other);
void operator=(const ValueArray21& other) = delete;
const T1 v1_;
const T2 v2_;
@ -13188,7 +13188,7 @@ class ValueArray22 {
private:
// No implementation - assignment is unsupported.
void operator=(const ValueArray22& other);
void operator=(const ValueArray22& other) = delete;
const T1 v1_;
const T2 v2_;
@ -13252,7 +13252,7 @@ class ValueArray23 {
private:
// No implementation - assignment is unsupported.
void operator=(const ValueArray23& other);
void operator=(const ValueArray23& other) = delete;
const T1 v1_;
const T2 v2_;
@ -13318,7 +13318,7 @@ class ValueArray24 {
private:
// No implementation - assignment is unsupported.
void operator=(const ValueArray24& other);
void operator=(const ValueArray24& other) = delete;
const T1 v1_;
const T2 v2_;
@ -13385,7 +13385,7 @@ class ValueArray25 {
private:
// No implementation - assignment is unsupported.
void operator=(const ValueArray25& other);
void operator=(const ValueArray25& other) = delete;
const T1 v1_;
const T2 v2_;
@ -13454,7 +13454,7 @@ class ValueArray26 {
private:
// No implementation - assignment is unsupported.
void operator=(const ValueArray26& other);
void operator=(const ValueArray26& other) = delete;
const T1 v1_;
const T2 v2_;
@ -13527,7 +13527,7 @@ class ValueArray27 {
private:
// No implementation - assignment is unsupported.
void operator=(const ValueArray27& other);
void operator=(const ValueArray27& other) = delete;
const T1 v1_;
const T2 v2_;
@ -13601,7 +13601,7 @@ class ValueArray28 {
private:
// No implementation - assignment is unsupported.
void operator=(const ValueArray28& other);
void operator=(const ValueArray28& other) = delete;
const T1 v1_;
const T2 v2_;
@ -13676,7 +13676,7 @@ class ValueArray29 {
private:
// No implementation - assignment is unsupported.
void operator=(const ValueArray29& other);
void operator=(const ValueArray29& other) = delete;
const T1 v1_;
const T2 v2_;
@ -13754,7 +13754,7 @@ class ValueArray30 {
private:
// No implementation - assignment is unsupported.
void operator=(const ValueArray30& other);
void operator=(const ValueArray30& other) = delete;
const T1 v1_;
const T2 v2_;
@ -13835,7 +13835,7 @@ class ValueArray31 {
private:
// No implementation - assignment is unsupported.
void operator=(const ValueArray31& other);
void operator=(const ValueArray31& other) = delete;
const T1 v1_;
const T2 v2_;
@ -13917,7 +13917,7 @@ class ValueArray32 {
private:
// No implementation - assignment is unsupported.
void operator=(const ValueArray32& other);
void operator=(const ValueArray32& other) = delete;
const T1 v1_;
const T2 v2_;
@ -14002,7 +14002,7 @@ class ValueArray33 {
private:
// No implementation - assignment is unsupported.
void operator=(const ValueArray33& other);
void operator=(const ValueArray33& other) = delete;
const T1 v1_;
const T2 v2_;
@ -14088,7 +14088,7 @@ class ValueArray34 {
private:
// No implementation - assignment is unsupported.
void operator=(const ValueArray34& other);
void operator=(const ValueArray34& other) = delete;
const T1 v1_;
const T2 v2_;
@ -14176,7 +14176,7 @@ class ValueArray35 {
private:
// No implementation - assignment is unsupported.
void operator=(const ValueArray35& other);
void operator=(const ValueArray35& other) = delete;
const T1 v1_;
const T2 v2_;
@ -14267,7 +14267,7 @@ class ValueArray36 {
private:
// No implementation - assignment is unsupported.
void operator=(const ValueArray36& other);
void operator=(const ValueArray36& other) = delete;
const T1 v1_;
const T2 v2_;
@ -14360,7 +14360,7 @@ class ValueArray37 {
private:
// No implementation - assignment is unsupported.
void operator=(const ValueArray37& other);
void operator=(const ValueArray37& other) = delete;
const T1 v1_;
const T2 v2_;
@ -14454,7 +14454,7 @@ class ValueArray38 {
private:
// No implementation - assignment is unsupported.
void operator=(const ValueArray38& other);
void operator=(const ValueArray38& other) = delete;
const T1 v1_;
const T2 v2_;
@ -14551,7 +14551,7 @@ class ValueArray39 {
private:
// No implementation - assignment is unsupported.
void operator=(const ValueArray39& other);
void operator=(const ValueArray39& other) = delete;
const T1 v1_;
const T2 v2_;
@ -14650,7 +14650,7 @@ class ValueArray40 {
private:
// No implementation - assignment is unsupported.
void operator=(const ValueArray40& other);
void operator=(const ValueArray40& other) = delete;
const T1 v1_;
const T2 v2_;
@ -14751,7 +14751,7 @@ class ValueArray41 {
private:
// No implementation - assignment is unsupported.
void operator=(const ValueArray41& other);
void operator=(const ValueArray41& other) = delete;
const T1 v1_;
const T2 v2_;
@ -14854,7 +14854,7 @@ class ValueArray42 {
private:
// No implementation - assignment is unsupported.
void operator=(const ValueArray42& other);
void operator=(const ValueArray42& other) = delete;
const T1 v1_;
const T2 v2_;
@ -14959,7 +14959,7 @@ class ValueArray43 {
private:
// No implementation - assignment is unsupported.
void operator=(const ValueArray43& other);
void operator=(const ValueArray43& other) = delete;
const T1 v1_;
const T2 v2_;
@ -15066,7 +15066,7 @@ class ValueArray44 {
private:
// No implementation - assignment is unsupported.
void operator=(const ValueArray44& other);
void operator=(const ValueArray44& other) = delete;
const T1 v1_;
const T2 v2_;
@ -15175,7 +15175,7 @@ class ValueArray45 {
private:
// No implementation - assignment is unsupported.
void operator=(const ValueArray45& other);
void operator=(const ValueArray45& other) = delete;
const T1 v1_;
const T2 v2_;
@ -15286,7 +15286,7 @@ class ValueArray46 {
private:
// No implementation - assignment is unsupported.
void operator=(const ValueArray46& other);
void operator=(const ValueArray46& other) = delete;
const T1 v1_;
const T2 v2_;
@ -15400,7 +15400,7 @@ class ValueArray47 {
private:
// No implementation - assignment is unsupported.
void operator=(const ValueArray47& other);
void operator=(const ValueArray47& other) = delete;
const T1 v1_;
const T2 v2_;
@ -15516,7 +15516,7 @@ class ValueArray48 {
private:
// No implementation - assignment is unsupported.
void operator=(const ValueArray48& other);
void operator=(const ValueArray48& other) = delete;
const T1 v1_;
const T2 v2_;
@ -15633,7 +15633,7 @@ class ValueArray49 {
private:
// No implementation - assignment is unsupported.
void operator=(const ValueArray49& other);
void operator=(const ValueArray49& other) = delete;
const T1 v1_;
const T2 v2_;
@ -15751,7 +15751,7 @@ class ValueArray50 {
private:
// No implementation - assignment is unsupported.
void operator=(const ValueArray50& other);
void operator=(const ValueArray50& other) = delete;
const T1 v1_;
const T2 v2_;
@ -15904,7 +15904,7 @@ class CartesianProductGenerator2
}
// No implementation - assignment is unsupported.
void operator=(const Iterator& other);
void operator=(const Iterator& other) = delete;
const ParamGeneratorInterface<ParamType>* const base_;
// begin[i]_ and end[i]_ define the i-th range that Iterator traverses.
@ -15919,7 +15919,7 @@ class CartesianProductGenerator2
}; // class CartesianProductGenerator2::Iterator
// No implementation - assignment is unsupported.
void operator=(const CartesianProductGenerator2& other);
void operator=(const CartesianProductGenerator2& other) = delete;
const ParamGenerator<T1> g1_;
const ParamGenerator<T2> g2_;
@ -16032,7 +16032,7 @@ class CartesianProductGenerator3
}
// No implementation - assignment is unsupported.
void operator=(const Iterator& other);
void operator=(const Iterator& other) = delete;
const ParamGeneratorInterface<ParamType>* const base_;
// begin[i]_ and end[i]_ define the i-th range that Iterator traverses.
@ -16050,7 +16050,7 @@ class CartesianProductGenerator3
}; // class CartesianProductGenerator3::Iterator
// No implementation - assignment is unsupported.
void operator=(const CartesianProductGenerator3& other);
void operator=(const CartesianProductGenerator3& other) = delete;
const ParamGenerator<T1> g1_;
const ParamGenerator<T2> g2_;
@ -16179,7 +16179,7 @@ class CartesianProductGenerator4
}
// No implementation - assignment is unsupported.
void operator=(const Iterator& other);
void operator=(const Iterator& other) = delete;
const ParamGeneratorInterface<ParamType>* const base_;
// begin[i]_ and end[i]_ define the i-th range that Iterator traverses.
@ -16200,7 +16200,7 @@ class CartesianProductGenerator4
}; // class CartesianProductGenerator4::Iterator
// No implementation - assignment is unsupported.
void operator=(const CartesianProductGenerator4& other);
void operator=(const CartesianProductGenerator4& other) = delete;
const ParamGenerator<T1> g1_;
const ParamGenerator<T2> g2_;
@ -16342,7 +16342,7 @@ class CartesianProductGenerator5
}
// No implementation - assignment is unsupported.
void operator=(const Iterator& other);
void operator=(const Iterator& other) = delete;
const ParamGeneratorInterface<ParamType>* const base_;
// begin[i]_ and end[i]_ define the i-th range that Iterator traverses.
@ -16366,7 +16366,7 @@ class CartesianProductGenerator5
}; // class CartesianProductGenerator5::Iterator
// No implementation - assignment is unsupported.
void operator=(const CartesianProductGenerator5& other);
void operator=(const CartesianProductGenerator5& other) = delete;
const ParamGenerator<T1> g1_;
const ParamGenerator<T2> g2_;
@ -16524,7 +16524,7 @@ class CartesianProductGenerator6
}
// No implementation - assignment is unsupported.
void operator=(const Iterator& other);
void operator=(const Iterator& other) = delete;
const ParamGeneratorInterface<ParamType>* const base_;
// begin[i]_ and end[i]_ define the i-th range that Iterator traverses.
@ -16551,7 +16551,7 @@ class CartesianProductGenerator6
}; // class CartesianProductGenerator6::Iterator
// No implementation - assignment is unsupported.
void operator=(const CartesianProductGenerator6& other);
void operator=(const CartesianProductGenerator6& other) = delete;
const ParamGenerator<T1> g1_;
const ParamGenerator<T2> g2_;
@ -16723,7 +16723,7 @@ class CartesianProductGenerator7
}
// No implementation - assignment is unsupported.
void operator=(const Iterator& other);
void operator=(const Iterator& other) = delete;
const ParamGeneratorInterface<ParamType>* const base_;
// begin[i]_ and end[i]_ define the i-th range that Iterator traverses.
@ -16753,7 +16753,7 @@ class CartesianProductGenerator7
}; // class CartesianProductGenerator7::Iterator
// No implementation - assignment is unsupported.
void operator=(const CartesianProductGenerator7& other);
void operator=(const CartesianProductGenerator7& other) = delete;
const ParamGenerator<T1> g1_;
const ParamGenerator<T2> g2_;
@ -16941,7 +16941,7 @@ class CartesianProductGenerator8
}
// No implementation - assignment is unsupported.
void operator=(const Iterator& other);
void operator=(const Iterator& other) = delete;
const ParamGeneratorInterface<ParamType>* const base_;
// begin[i]_ and end[i]_ define the i-th range that Iterator traverses.
@ -16974,7 +16974,7 @@ class CartesianProductGenerator8
}; // class CartesianProductGenerator8::Iterator
// No implementation - assignment is unsupported.
void operator=(const CartesianProductGenerator8& other);
void operator=(const CartesianProductGenerator8& other) = delete;
const ParamGenerator<T1> g1_;
const ParamGenerator<T2> g2_;
@ -17176,7 +17176,7 @@ class CartesianProductGenerator9
}
// No implementation - assignment is unsupported.
void operator=(const Iterator& other);
void operator=(const Iterator& other) = delete;
const ParamGeneratorInterface<ParamType>* const base_;
// begin[i]_ and end[i]_ define the i-th range that Iterator traverses.
@ -17212,7 +17212,7 @@ class CartesianProductGenerator9
}; // class CartesianProductGenerator9::Iterator
// No implementation - assignment is unsupported.
void operator=(const CartesianProductGenerator9& other);
void operator=(const CartesianProductGenerator9& other) = delete;
const ParamGenerator<T1> g1_;
const ParamGenerator<T2> g2_;
@ -17428,7 +17428,7 @@ class CartesianProductGenerator10
}
// No implementation - assignment is unsupported.
void operator=(const Iterator& other);
void operator=(const Iterator& other) = delete;
const ParamGeneratorInterface<ParamType>* const base_;
// begin[i]_ and end[i]_ define the i-th range that Iterator traverses.
@ -17467,7 +17467,7 @@ class CartesianProductGenerator10
}; // class CartesianProductGenerator10::Iterator
// No implementation - assignment is unsupported.
void operator=(const CartesianProductGenerator10& other);
void operator=(const CartesianProductGenerator10& other) = delete;
const ParamGenerator<T1> g1_;
const ParamGenerator<T2> g2_;
@ -17503,7 +17503,7 @@ CartesianProductHolder2(const Generator1& g1, const Generator2& g2)
private:
// No implementation - assignment is unsupported.
void operator=(const CartesianProductHolder2& other);
void operator=(const CartesianProductHolder2& other) = delete;
const Generator1 g1_;
const Generator2 g2_;
@ -17526,7 +17526,7 @@ CartesianProductHolder3(const Generator1& g1, const Generator2& g2,
private:
// No implementation - assignment is unsupported.
void operator=(const CartesianProductHolder3& other);
void operator=(const CartesianProductHolder3& other) = delete;
const Generator1 g1_;
const Generator2 g2_;
@ -17552,7 +17552,7 @@ CartesianProductHolder4(const Generator1& g1, const Generator2& g2,
private:
// No implementation - assignment is unsupported.
void operator=(const CartesianProductHolder4& other);
void operator=(const CartesianProductHolder4& other) = delete;
const Generator1 g1_;
const Generator2 g2_;
@ -17580,7 +17580,7 @@ CartesianProductHolder5(const Generator1& g1, const Generator2& g2,
private:
// No implementation - assignment is unsupported.
void operator=(const CartesianProductHolder5& other);
void operator=(const CartesianProductHolder5& other) = delete;
const Generator1 g1_;
const Generator2 g2_;
@ -17612,7 +17612,7 @@ CartesianProductHolder6(const Generator1& g1, const Generator2& g2,
private:
// No implementation - assignment is unsupported.
void operator=(const CartesianProductHolder6& other);
void operator=(const CartesianProductHolder6& other) = delete;
const Generator1 g1_;
const Generator2 g2_;
@ -17647,7 +17647,7 @@ CartesianProductHolder7(const Generator1& g1, const Generator2& g2,
private:
// No implementation - assignment is unsupported.
void operator=(const CartesianProductHolder7& other);
void operator=(const CartesianProductHolder7& other) = delete;
const Generator1 g1_;
const Generator2 g2_;
@ -17686,7 +17686,7 @@ CartesianProductHolder8(const Generator1& g1, const Generator2& g2,
private:
// No implementation - assignment is unsupported.
void operator=(const CartesianProductHolder8& other);
void operator=(const CartesianProductHolder8& other) = delete;
const Generator1 g1_;
const Generator2 g2_;
@ -17729,7 +17729,7 @@ CartesianProductHolder9(const Generator1& g1, const Generator2& g2,
private:
// No implementation - assignment is unsupported.
void operator=(const CartesianProductHolder9& other);
void operator=(const CartesianProductHolder9& other) = delete;
const Generator1 g1_;
const Generator2 g2_;
@ -17775,7 +17775,7 @@ CartesianProductHolder10(const Generator1& g1, const Generator2& g2,
private:
// No implementation - assignment is unsupported.
void operator=(const CartesianProductHolder10& other);
void operator=(const CartesianProductHolder10& other) = delete;
const Generator1 g1_;
const Generator2 g2_;

2
modules/ts/src/ts_perf.cpp
Unescape View File

@ -2168,7 +2168,7 @@ struct KeypointComparator
return cmp(pts_[idx1], pts_[idx2]);
}
private:
const KeypointComparator& operator=(const KeypointComparator&); // quiet MSVC
KeypointComparator& operator=(const KeypointComparator&) = delete;
};
}//namespace

2
platforms/ios/build_framework.py
Unescape View File

@ -113,7 +113,7 @@ class Builder:
cmake_flags.append("-DCMAKE_CXX_FLAGS=" + " ".join(c_flags))
cmake_flags.append("-DCMAKE_EXE_LINKER_FLAGS=" + " ".join(c_flags))
# CMake annot compile Swift for Catalyst https://gitlab.kitware.com/cmake/cmake/-/issues/21436
# CMake cannot compile Swift for Catalyst https://gitlab.kitware.com/cmake/cmake/-/issues/21436
# cmake_flags.append("-DCMAKE_Swift_FLAGS=" + " " + target_flag)
cmake_flags.append("-DSWIFT_DISABLED=1")

Write Preview
Loading…
Cancel
Save