mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-07 17:44:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

add noexcept to default constructors of cv::ocl

Browse Source 
- follows iso c++ guideline C.44
- enables default compiler-created constructors to
  also be noexcept
This commit is contained in:
Dale Phurrough 2021-02-20 14:16:47 +01:00
parent 54d80d9168
commit 77e26a7db3
No known key found for this signature in database
GPG Key ID: E53384A29713D41F
3 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/core/include/opencv2/core/ocl.hpp
View File

@ -70,7 +70,7 @@ class CV_EXPORTS Image2D;
class CV_EXPORTS_W_SIMPLE Device class CV_EXPORTS_W_SIMPLE Device
{ {
public: public:
CV_WRAP Device(); CV_WRAP Device() CV_NOEXCEPT;
explicit Device(void* d); explicit Device(void* d);
Device(const Device& d); Device(const Device& d);
Device& operator = (const Device& d); Device& operator = (const Device& d);
@ -245,7 +245,7 @@ protected:
class CV_EXPORTS Context class CV_EXPORTS Context
{ {
public: public:
Context(); Context() CV_NOEXCEPT;
explicit Context(int dtype); //!< @deprecated explicit Context(int dtype); //!< @deprecated
~Context(); ~Context();
Context(const Context& c); Context(const Context& c);
@ -298,7 +298,7 @@ public:
class CV_EXPORTS Platform class CV_EXPORTS Platform
{ {
public: public:
Platform(); Platform() CV_NOEXCEPT;
~Platform(); ~Platform();
Platform(const Platform& p); Platform(const Platform& p);
Platform& operator = (const Platform& p); Platform& operator = (const Platform& p);
@ -357,7 +357,7 @@ void initializeContextFromHandle(Context& ctx, void* platform, void* context, vo
class CV_EXPORTS Queue class CV_EXPORTS Queue
{ {
public: public:
Queue(); Queue() CV_NOEXCEPT;
explicit Queue(const Context& c, const Device& d=Device()); explicit Queue(const Context& c, const Device& d=Device());
~Queue(); ~Queue();
Queue(const Queue& q); Queue(const Queue& q);
@ -421,7 +421,7 @@ public:
class CV_EXPORTS Kernel class CV_EXPORTS Kernel
{ {
public: public:
Kernel(); Kernel() CV_NOEXCEPT;
Kernel(const char* kname, const Program& prog); Kernel(const char* kname, const Program& prog);
Kernel(const char* kname, const ProgramSource& prog, Kernel(const char* kname, const ProgramSource& prog,
const String& buildopts = String(), String* errmsg=0); const String& buildopts = String(), String* errmsg=0);
@ -498,7 +498,7 @@ protected:
class CV_EXPORTS Program class CV_EXPORTS Program
{ {
public: public:
Program(); Program() CV_NOEXCEPT;
Program(const ProgramSource& src, Program(const ProgramSource& src,
const String& buildflags, String& errmsg); const String& buildflags, String& errmsg);
Program(const Program& prog); Program(const Program& prog);
@ -544,7 +544,7 @@ class CV_EXPORTS ProgramSource
public: public:
typedef uint64 hash_t; // deprecated typedef uint64 hash_t; // deprecated
ProgramSource(); ProgramSource() CV_NOEXCEPT;
explicit ProgramSource(const String& module, const String& name, const String& codeStr, const String& codeHash); explicit ProgramSource(const String& module, const String& name, const String& codeStr, const String& codeHash);
explicit ProgramSource(const String& prog); // deprecated explicit ProgramSource(const String& prog); // deprecated
explicit ProgramSource(const char* prog); // deprecated explicit ProgramSource(const char* prog); // deprecated
@ -614,7 +614,7 @@ protected:
class CV_EXPORTS PlatformInfo class CV_EXPORTS PlatformInfo
{ {
public: public:
PlatformInfo(); PlatformInfo() CV_NOEXCEPT;
/** /**
* @param id pointer cl_platform_id (cl_platform_id*) * @param id pointer cl_platform_id (cl_platform_id*)
*/ */

19
modules/core/src/ocl.cpp
View File

@ -1451,7 +1451,7 @@ struct Platform::Impl
bool initialized; bool initialized;
}; };
Platform::Platform() Platform::Platform() CV_NOEXCEPT
{ {
p = 0; p = 0;
} }
@ -1677,7 +1677,7 @@ struct Device::Impl
}; };
Device::Device() Device::Device() CV_NOEXCEPT
{ {
p = 0; p = 0;
} }
@ -2834,7 +2834,7 @@ public:
}; };
Context::Context() Context::Context() CV_NOEXCEPT
{ {
p = 0; p = 0;
} }
@ -3231,7 +3231,7 @@ struct Queue::Impl
cv::ocl::Queue profiling_queue_; cv::ocl::Queue profiling_queue_;
}; };
Queue::Queue() Queue::Queue() CV_NOEXCEPT
{ {
p = 0; p = 0;
} }
@ -3457,7 +3457,7 @@ static void CL_CALLBACK oclCleanupCallback(cl_event e, cl_int, void *p)
namespace cv { namespace ocl { namespace cv { namespace ocl {
Kernel::Kernel() Kernel::Kernel() CV_NOEXCEPT
{ {
p = 0; p = 0;
} }
@ -4047,7 +4047,7 @@ struct ProgramSource::Impl
}; };
ProgramSource::ProgramSource() ProgramSource::ProgramSource() CV_NOEXCEPT
{ {
p = 0; p = 0;
} }
@ -4556,7 +4556,10 @@ struct Program::Impl
}; };
Program::Program() { p = 0; } Program::Program() CV_NOEXCEPT
{
p = 0;
}
Program::Program(const ProgramSource& src, Program::Program(const ProgramSource& src,
const String& buildflags, String& errmsg) const String& buildflags, String& errmsg)
@ -6608,7 +6611,7 @@ struct PlatformInfo::Impl
int versionMinor_; int versionMinor_;
}; };
PlatformInfo::PlatformInfo() PlatformInfo::PlatformInfo() CV_NOEXCEPT
{ {
p = 0; p = 0;
} }

16
modules/core/src/ocl_disabled.impl.hpp
View File

@ -34,7 +34,7 @@ CV_EXPORTS_W void finish() { /* nothing */ }
CV_EXPORTS bool haveSVM() { return false; } CV_EXPORTS bool haveSVM() { return false; }
Device::Device() : p(NULL) { } Device::Device() CV_NOEXCEPT : p(NULL) { }
Device::Device(void* d) : p(NULL) { OCL_NOT_AVAILABLE(); } Device::Device(void* d) : p(NULL) { OCL_NOT_AVAILABLE(); }
Device::Device(const Device& d) : p(NULL) { } Device::Device(const Device& d) : p(NULL) { }
Device& Device::operator=(const Device& d) { return *this; } Device& Device::operator=(const Device& d) { return *this; }
@ -147,7 +147,7 @@ const Device& Device::getDefault()
/* static */ Device Device::fromHandle(void* d) { OCL_NOT_AVAILABLE(); } /* static */ Device Device::fromHandle(void* d) { OCL_NOT_AVAILABLE(); }
Context::Context() : p(NULL) { } Context::Context() CV_NOEXCEPT : p(NULL) { }
Context::Context(int dtype) : p(NULL) { } Context::Context(int dtype) : p(NULL) { }
Context::~Context() { } Context::~Context() { }
Context::Context(const Context& c) : p(NULL) { } Context::Context(const Context& c) : p(NULL) { }
@ -178,7 +178,7 @@ void Context::setUseSVM(bool enabled) { }
void Context::release() { } void Context::release() { }
Platform::Platform() : p(NULL) { } Platform::Platform() CV_NOEXCEPT : p(NULL) { }
Platform::~Platform() { } Platform::~Platform() { }
Platform::Platform(const Platform&) : p(NULL) { } Platform::Platform(const Platform&) : p(NULL) { }
Platform& Platform::operator=(const Platform&) { return *this; } Platform& Platform::operator=(const Platform&) { return *this; }
@ -198,7 +198,7 @@ void convertFromImage(void* cl_mem_image, UMat& dst) { OCL_NOT_AVAILABLE(); }
void initializeContextFromHandle(Context& ctx, void* platform, void* context, void* device) { OCL_NOT_AVAILABLE(); } void initializeContextFromHandle(Context& ctx, void* platform, void* context, void* device) { OCL_NOT_AVAILABLE(); }
Queue::Queue() : p(NULL) { } Queue::Queue() CV_NOEXCEPT : p(NULL) { }
Queue::Queue(const Context& c, const Device& d) : p(NULL) { OCL_NOT_AVAILABLE(); } Queue::Queue(const Context& c, const Device& d) : p(NULL) { OCL_NOT_AVAILABLE(); }
Queue::~Queue() { } Queue::~Queue() { }
Queue::Queue(const Queue& q) {} Queue::Queue(const Queue& q) {}
@ -235,7 +235,7 @@ KernelArg KernelArg::Constant(const Mat& m)
} }
Kernel::Kernel() : p(NULL) { } Kernel::Kernel() CV_NOEXCEPT : p(NULL) { }
Kernel::Kernel(const char* kname, const Program& prog) : p(NULL) { OCL_NOT_AVAILABLE(); } Kernel::Kernel(const char* kname, const Program& prog) : p(NULL) { OCL_NOT_AVAILABLE(); }
Kernel::Kernel(const char* kname, const ProgramSource& prog, const String& buildopts, String* errmsg) : p(NULL) { OCL_NOT_AVAILABLE(); } Kernel::Kernel(const char* kname, const ProgramSource& prog, const String& buildopts, String* errmsg) : p(NULL) { OCL_NOT_AVAILABLE(); }
Kernel::~Kernel() { } Kernel::~Kernel() { }
@ -264,7 +264,7 @@ size_t Kernel::localMemSize() const { OCL_NOT_AVAILABLE(); }
void* Kernel::ptr() const { return NULL; } void* Kernel::ptr() const { return NULL; }
Program::Program() : p(NULL) { } Program::Program() CV_NOEXCEPT : p(NULL) { }
Program::Program(const ProgramSource& src, const String& buildflags, String& errmsg) : p(NULL) { OCL_NOT_AVAILABLE(); } Program::Program(const ProgramSource& src, const String& buildflags, String& errmsg) : p(NULL) { OCL_NOT_AVAILABLE(); }
Program::Program(const Program& prog) : p(NULL) { } Program::Program(const Program& prog) : p(NULL) { }
Program& Program::operator=(const Program& prog) { return *this; } Program& Program::operator=(const Program& prog) { return *this; }
@ -283,7 +283,7 @@ String Program::getPrefix() const { OCL_NOT_AVAILABLE(); }
/* static */ String Program::getPrefix(const String& buildflags) { OCL_NOT_AVAILABLE(); } /* static */ String Program::getPrefix(const String& buildflags) { OCL_NOT_AVAILABLE(); }
ProgramSource::ProgramSource() : p(NULL) { } ProgramSource::ProgramSource() CV_NOEXCEPT : p(NULL) { }
ProgramSource::ProgramSource(const String& module, const String& name, const String& codeStr, const String& codeHash) : p(NULL) { } ProgramSource::ProgramSource(const String& module, const String& name, const String& codeStr, const String& codeHash) : p(NULL) { }
ProgramSource::ProgramSource(const String& prog) : p(NULL) { } ProgramSource::ProgramSource(const String& prog) : p(NULL) { }
ProgramSource::ProgramSource(const char* prog) : p(NULL) { } ProgramSource::ProgramSource(const char* prog) : p(NULL) { }
@ -298,7 +298,7 @@ ProgramSource::hash_t ProgramSource::hash() const { OCL_NOT_AVAILABLE(); }
/* static */ ProgramSource ProgramSource::fromSPIR(const String& module, const String& name, const unsigned char* binary, const size_t size, const cv::String& buildOptions) { OCL_NOT_AVAILABLE(); } /* static */ ProgramSource ProgramSource::fromSPIR(const String& module, const String& name, const unsigned char* binary, const size_t size, const cv::String& buildOptions) { OCL_NOT_AVAILABLE(); }
PlatformInfo::PlatformInfo() : p(NULL) { } PlatformInfo::PlatformInfo() CV_NOEXCEPT : p(NULL) { }
PlatformInfo::PlatformInfo(void* id) : p(NULL) { OCL_NOT_AVAILABLE(); } PlatformInfo::PlatformInfo(void* id) : p(NULL) { OCL_NOT_AVAILABLE(); }
PlatformInfo::~PlatformInfo() { } PlatformInfo::~PlatformInfo() { }