mirror of
https://github.com/opencv/opencv.git
synced 2026-07-29 15:23:05 +04:00
Merge pull request #29269 from peters:fix/gpumatnd-move-assignment
core: fix GpuMatND move operations with CUDA 10.2
This commit is contained in:
@@ -500,16 +500,8 @@ public:
|
||||
GpuMatND(const GpuMatND&) = default;
|
||||
GpuMatND& operator=(const GpuMatND&) = default;
|
||||
|
||||
#if defined(__GNUC__) && __GNUC__ < 5
|
||||
// error: function '...' defaulted on its first declaration with an exception-specification
|
||||
// that differs from the implicit declaration '...'
|
||||
|
||||
GpuMatND(GpuMatND&&) = default;
|
||||
GpuMatND& operator=(GpuMatND&&) = default;
|
||||
#else
|
||||
GpuMatND(GpuMatND&&) noexcept = default;
|
||||
GpuMatND& operator=(GpuMatND&&) noexcept = default;
|
||||
#endif
|
||||
|
||||
void upload(InputArray src);
|
||||
void upload(InputArray src, Stream& stream);
|
||||
|
||||
Reference in New Issue
Block a user