Merge pull request #20954 from shengyu7697:remove-redundant-semicolon

pull/20963/head
Alexander Alekhin 3 years ago
commit 96488c1c74
  1. 2
      modules/gapi/include/opencv2/gapi/fluid/gfluidbuffer.hpp
  2. 2
      modules/gapi/include/opencv2/gapi/gtransform.hpp
  3. 2
      modules/gapi/include/opencv2/gapi/plaidml/gplaidmlkernel.hpp
  4. 4
      modules/gapi/include/opencv2/gapi/streaming/onevpl/data_provider_interface.hpp
  5. 2
      modules/gapi/include/opencv2/gapi/util/optional.hpp
  6. 2
      modules/gapi/src/compiler/gislandmodel.hpp
  7. 4
      modules/gapi/src/compiler/transactions.hpp
  8. 4
      modules/gapi/src/executor/gtbbexecutor.hpp

@ -25,7 +25,7 @@ namespace fluid {
struct Border struct Border
{ {
// This constructor is required to support existing kernels which are part of G-API // This constructor is required to support existing kernels which are part of G-API
Border(int _type, cv::Scalar _val) : type(_type), value(_val) {}; Border(int _type, cv::Scalar _val) : type(_type), value(_val) {}
int type; int type;
cv::Scalar value; cv::Scalar value;

@ -31,7 +31,7 @@ struct GAPI_EXPORTS GTransform
F pattern; F pattern;
F substitute; F substitute;
GTransform(const std::string& d, const F &p, const F &s) : description(d), pattern(p), substitute(s){}; GTransform(const std::string& d, const F &p, const F &s) : description(d), pattern(p), substitute(s) {}
}; };
namespace detail namespace detail

@ -59,7 +59,7 @@ public:
using F = std::function<void(GPlaidMLContext &)>; using F = std::function<void(GPlaidMLContext &)>;
GPlaidMLKernel() = default; GPlaidMLKernel() = default;
explicit GPlaidMLKernel(const F& f) : m_f(f) {}; explicit GPlaidMLKernel(const F& f) : m_f(f) {}
void apply(GPlaidMLContext &ctx) const void apply(GPlaidMLContext &ctx) const
{ {

@ -17,7 +17,7 @@ namespace wip {
namespace onevpl { namespace onevpl {
struct GAPI_EXPORTS DataProviderException : public std::exception { struct GAPI_EXPORTS DataProviderException : public std::exception {
virtual ~DataProviderException() {}; virtual ~DataProviderException() {}
}; };
struct GAPI_EXPORTS DataProviderSystemErrorException : public DataProviderException { struct GAPI_EXPORTS DataProviderSystemErrorException : public DataProviderException {
@ -42,7 +42,7 @@ private:
struct GAPI_EXPORTS IDataProvider { struct GAPI_EXPORTS IDataProvider {
using Ptr = std::shared_ptr<IDataProvider>; using Ptr = std::shared_ptr<IDataProvider>;
virtual ~IDataProvider() {}; virtual ~IDataProvider() {}
/** /**
* The function is used by onevpl::GSource to extract binary data stream from @ref IDataProvider * The function is used by onevpl::GSource to extract binary data stream from @ref IDataProvider

@ -33,7 +33,7 @@ namespace util
// Constructors // Constructors
// NB.: there were issues with Clang 3.8 when =default() was used // NB.: there were issues with Clang 3.8 when =default() was used
// instead {} // instead {}
optional() {}; optional() {}
optional(const optional&) = default; optional(const optional&) = default;
explicit optional(T&&) noexcept; explicit optional(T&&) noexcept;
explicit optional(const T&) noexcept; explicit optional(const T&) noexcept;

@ -140,7 +140,7 @@ public:
// FIXME: This thing will likely break stuff once we introduce // FIXME: This thing will likely break stuff once we introduce
// "multi-source streaming", a better design needs to be proposed // "multi-source streaming", a better design needs to be proposed
// at that stage. // at that stage.
virtual void handleNewStream() {}; // do nothing here by default virtual void handleNewStream() {} // do nothing here by default
// This method is called for every IslandExecutable when // This method is called for every IslandExecutable when
// the stream-based execution is stopped. // the stream-based execution is stopped.

@ -69,8 +69,8 @@ struct ChangeT
{ {
struct Base struct Base
{ {
virtual void commit (ade::Graph & ) {}; virtual void commit (ade::Graph & ) {}
virtual void rollback(ade::Graph & ) {}; virtual void rollback(ade::Graph & ) {}
virtual ~Base() = default; virtual ~Base() = default;
}; };

@ -83,8 +83,8 @@ struct tile_node {
std::vector<tile_node*> dependants; std::vector<tile_node*> dependants;
tile_node(decltype(sync_task_body::body)&& f) : task_body(sync_task_body{std::move(f)}) {}; tile_node(decltype(sync_task_body::body)&& f) : task_body(sync_task_body{std::move(f)}) {}
tile_node(async_tag, decltype(async_task_body::body)&& f) : task_body(async_task_body{std::move(f)}) {}; tile_node(async_tag, decltype(async_task_body::body)&& f) : task_body(async_task_body{std::move(f)}) {}
}; };
std::ostream& operator<<(std::ostream& o, tile_node const& n); std::ostream& operator<<(std::ostream& o, tile_node const& n);

Loading…
Cancel
Save