mirror of
https://github.com/opencv/opencv.git
synced 2025-07-29 08:46:45 +08:00
Merge pull request #19466 from alalek:hotfix_19259
This commit is contained in:
commit
f46b1252c4
@ -452,8 +452,16 @@ public:
|
|||||||
GpuMatND(const GpuMatND&) = default;
|
GpuMatND(const GpuMatND&) = default;
|
||||||
GpuMatND& operator=(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(GpuMatND&&) noexcept = default;
|
||||||
GpuMatND& operator=(GpuMatND&&) noexcept = default;
|
GpuMatND& operator=(GpuMatND&&) noexcept = default;
|
||||||
|
#endif
|
||||||
|
|
||||||
void upload(InputArray src);
|
void upload(InputArray src);
|
||||||
void upload(InputArray src, Stream& stream);
|
void upload(InputArray src, Stream& stream);
|
||||||
|
Loading…
Reference in New Issue
Block a user