Commit e7bb0ece authored by Alexander Alekhin's avatar Alexander Alekhin

gapi: fix build with unique_ptr

avoid generation of copy ctors with unique_ptr members
parent f6ec0cd8
...@@ -1328,7 +1328,7 @@ cv::gimpl::GParallelFluidExecutable::GParallelFluidExecutable(const ade::Graph ...@@ -1328,7 +1328,7 @@ cv::gimpl::GParallelFluidExecutable::GParallelFluidExecutable(const ade::Graph
const std::vector<GFluidOutputRois> &parallelOutputRois) const std::vector<GFluidOutputRois> &parallelOutputRois)
{ {
for (auto&& rois : parallelOutputRois){ for (auto&& rois : parallelOutputRois){
tiles.emplace_back(g, graph_data, rois.rois); tiles.emplace_back(new GFluidExecutable(g, graph_data, rois.rois));
} }
} }
...@@ -1343,7 +1343,8 @@ void cv::gimpl::GParallelFluidExecutable::run(std::vector<InObj> &&input_objs, ...@@ -1343,7 +1343,8 @@ void cv::gimpl::GParallelFluidExecutable::run(std::vector<InObj> &&input_objs,
std::vector<OutObj> &&output_objs) std::vector<OutObj> &&output_objs)
{ {
for (auto& tile : tiles ){ for (auto& tile : tiles ){
tile.run(input_objs, output_objs); GAPI_Assert((bool)tile);
tile->run(input_objs, output_objs);
} }
} }
......
...@@ -118,6 +118,8 @@ FluidGraphInputData fluidExtractInputDataFromGraph(const ade::Graph &m_g, const ...@@ -118,6 +118,8 @@ FluidGraphInputData fluidExtractInputDataFromGraph(const ade::Graph &m_g, const
class GFluidExecutable final: public GIslandExecutable class GFluidExecutable final: public GIslandExecutable
{ {
GFluidExecutable(const GFluidExecutable&) = delete; // due std::unique_ptr in members list
const ade::Graph &m_g; const ade::Graph &m_g;
GModel::ConstGraph m_gm; GModel::ConstGraph m_gm;
...@@ -161,7 +163,9 @@ public: ...@@ -161,7 +163,9 @@ public:
class GParallelFluidExecutable final: public GIslandExecutable { class GParallelFluidExecutable final: public GIslandExecutable {
std::vector<GFluidExecutable> tiles; GParallelFluidExecutable(const GParallelFluidExecutable&) = delete; // due std::unique_ptr in members list
std::vector<std::unique_ptr<GFluidExecutable>> tiles;
public: public:
GParallelFluidExecutable(const ade::Graph &g, GParallelFluidExecutable(const ade::Graph &g,
const FluidGraphInputData &graph_data, const FluidGraphInputData &graph_data,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment