Fixed -Wunnecessary-virtual-specifier warning produced latest clang.

asmorkalov · D00E · commit a57401d238a7 · 2025-09-19T23:08:47.000+01:00
diff --git a/modules/dnn/src/layers/elementwise_layers.cpp b/modules/dnn/src/layers/elementwise_layers.cpp
@@ -283,8 +283,8 @@ class ElementWiseLayer : public Func::Layer
     }
 #endif
 
-    virtual bool tryQuantize(const std::vector<std::vector<float> > &scales,
-                             const std::vector<std::vector<int> > &zeropoints, LayerParams& params) CV_OVERRIDE
+    bool tryQuantize(const std::vector<std::vector<float> > &scales,
+                     const std::vector<std::vector<int> > &zeropoints, LayerParams& params) CV_OVERRIDE
     {
         return func.tryQuantize(scales, zeropoints, params);
     }
diff --git a/modules/dnn/src/layers/fully_connected_layer.cpp b/modules/dnn/src/layers/fully_connected_layer.cpp
@@ -823,8 +823,8 @@ class FullyConnectedLayerImpl CV_FINAL : public InnerProductLayer
     }
 #endif  // HAVE_DNN_NGRAPH
 
-    virtual bool tryQuantize(const std::vector<std::vector<float> > &scales,
-                             const std::vector<std::vector<int> > &zeropoints, LayerParams& params) CV_OVERRIDE
+    bool tryQuantize(const std::vector<std::vector<float> > &scales,
+                     const std::vector<std::vector<int> > &zeropoints, LayerParams& params) CV_OVERRIDE
     {
         if (blobs.empty())
             return false;
diff --git a/modules/dnn/src/layers/permute_layer.cpp b/modules/dnn/src/layers/permute_layer.cpp
@@ -587,8 +587,8 @@ class PermuteLayerImpl CV_FINAL : public PermuteLayer
     }
 #endif // HAVE_TIMVX
 
-    virtual bool tryQuantize(const std::vector<std::vector<float> > &scales,
-                             const std::vector<std::vector<int> > &zeropoints, LayerParams& params) CV_OVERRIDE
+    bool tryQuantize(const std::vector<std::vector<float> > &scales,
+                     const std::vector<std::vector<int> > &zeropoints, LayerParams& params) CV_OVERRIDE
     {
         return true;
     }
diff --git a/modules/dnn/src/layers/reshape_layer.cpp b/modules/dnn/src/layers/reshape_layer.cpp
@@ -526,8 +526,8 @@ class ReshapeLayerImpl CV_FINAL : public ReshapeLayer
         return Ptr<BackendNode>();
     }
 
-    virtual bool tryQuantize(const std::vector<std::vector<float> > &scales,
-                             const std::vector<std::vector<int> > &zeropoints, LayerParams& params) CV_OVERRIDE
+    bool tryQuantize(const std::vector<std::vector<float> > &scales,
+                     const std::vector<std::vector<int> > &zeropoints, LayerParams& params) CV_OVERRIDE
     {
         return true;
     }
diff --git a/modules/dnn/src/layers/resize_layer.cpp b/modules/dnn/src/layers/resize_layer.cpp
@@ -444,8 +444,8 @@ class ResizeLayerImpl : public ResizeLayer
     }
 #endif
 
-    virtual bool tryQuantize(const std::vector<std::vector<float> > &scales,
-                             const std::vector<std::vector<int> > &zeropoints, LayerParams& params) CV_OVERRIDE
+    bool tryQuantize(const std::vector<std::vector<float> > &scales,
+                     const std::vector<std::vector<int> > &zeropoints, LayerParams& params) CV_OVERRIDE
     {
         return true;
     }
diff --git a/modules/dnn/src/layers/scale_layer.cpp b/modules/dnn/src/layers/scale_layer.cpp
@@ -419,8 +419,8 @@ class ScaleLayerImpl CV_FINAL : public ScaleLayer
         shift = (hasBias && !blobs.empty()) ? blobs.back() : Mat();
     }
 
-    virtual bool tryQuantize(const std::vector<std::vector<float> > &scales,
-                             const std::vector<std::vector<int> > &zeropoints, LayerParams& params) CV_OVERRIDE
+    bool tryQuantize(const std::vector<std::vector<float> > &scales,
+                     const std::vector<std::vector<int> > &zeropoints, LayerParams& params) CV_OVERRIDE
     {
         params.set("input_scales", DictValue::arrayReal(scales[0].data(), scales[0].size()));
         params.set("input_zeropoints", DictValue::arrayInt(zeropoints[0].data(), zeropoints[0].size()));
diff --git a/modules/dnn/src/layers/shuffle_channel_layer.cpp b/modules/dnn/src/layers/shuffle_channel_layer.cpp
@@ -147,8 +147,8 @@ class ShuffleChannelLayerImpl CV_FINAL : public ShuffleChannelLayer
     }
 #endif
 
-    virtual bool tryQuantize(const std::vector<std::vector<float> > &scales,
-                             const std::vector<std::vector<int> > &zeropoints, LayerParams& params) CV_OVERRIDE
+    bool tryQuantize(const std::vector<std::vector<float> > &scales,
+                     const std::vector<std::vector<int> > &zeropoints, LayerParams& params) CV_OVERRIDE
     {
         return true;
     }
diff --git a/modules/dnn/src/layers/slice_layer.cpp b/modules/dnn/src/layers/slice_layer.cpp
@@ -813,8 +813,8 @@ class SliceLayerImpl : public SliceLayer
     }
 #endif
 
-    virtual bool tryQuantize(const std::vector<std::vector<float> > &scales,
-                             const std::vector<std::vector<int> > &zeropoints, LayerParams& params) CV_OVERRIDE
+    bool tryQuantize(const std::vector<std::vector<float> > &scales,
+                     const std::vector<std::vector<int> > &zeropoints, LayerParams& params) CV_OVERRIDE
     {
         const int numOutputs = scales[1].size();
         for (int i = 0; i < numOutputs; i++)
diff --git a/modules/dnn/src/layers/split_layer.cpp b/modules/dnn/src/layers/split_layer.cpp
@@ -117,8 +117,8 @@ class SplitLayerImpl CV_FINAL : public SplitLayer
     }
 #endif
 
-    virtual bool tryQuantize(const std::vector<std::vector<float> > &scales,
-                             const std::vector<std::vector<int> > &zeropoints, LayerParams& params) CV_OVERRIDE
+    bool tryQuantize(const std::vector<std::vector<float> > &scales,
+                     const std::vector<std::vector<int> > &zeropoints, LayerParams& params) CV_OVERRIDE
     {
         const int numOutputs = scales[1].size();
         for (int i = 0; i < numOutputs; i++)

Original file line number	Diff line number	Diff line change
`@@ -283,8 +283,8 @@ class ElementWiseLayer : public Func::Layer`
`283`	`283`	`}`
`284`	`284`	`#endif`
`285`	`285`
`286`		`- virtual bool tryQuantize(const std::vector<std::vector<float> > &scales,`
`287`		`- const std::vector<std::vector<int> > &zeropoints, LayerParams& params) CV_OVERRIDE`
	`286`	`+ bool tryQuantize(const std::vector<std::vector<float> > &scales,`
	`287`	`+ const std::vector<std::vector<int> > &zeropoints, LayerParams& params) CV_OVERRIDE`
`288`	`288`	`{`
`289`	`289`	`return func.tryQuantize(scales, zeropoints, params);`
`290`	`290`	`}`
Original file line number	Diff line number	Diff line change
`@@ -823,8 +823,8 @@ class FullyConnectedLayerImpl CV_FINAL : public InnerProductLayer`
`823`	`823`	`}`
`824`	`824`	`#endif // HAVE_DNN_NGRAPH`
`825`	`825`
`826`		`- virtual bool tryQuantize(const std::vector<std::vector<float> > &scales,`
`827`		`- const std::vector<std::vector<int> > &zeropoints, LayerParams& params) CV_OVERRIDE`
	`826`	`+ bool tryQuantize(const std::vector<std::vector<float> > &scales,`
	`827`	`+ const std::vector<std::vector<int> > &zeropoints, LayerParams& params) CV_OVERRIDE`
`828`	`828`	`{`
`829`	`829`	`if (blobs.empty())`
`830`	`830`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -587,8 +587,8 @@ class PermuteLayerImpl CV_FINAL : public PermuteLayer`
`587`	`587`	`}`
`588`	`588`	`#endif // HAVE_TIMVX`
`589`	`589`
`590`		`- virtual bool tryQuantize(const std::vector<std::vector<float> > &scales,`
`591`		`- const std::vector<std::vector<int> > &zeropoints, LayerParams& params) CV_OVERRIDE`
	`590`	`+ bool tryQuantize(const std::vector<std::vector<float> > &scales,`
	`591`	`+ const std::vector<std::vector<int> > &zeropoints, LayerParams& params) CV_OVERRIDE`
`592`	`592`	`{`
`593`	`593`	`return true;`
`594`	`594`	`}`
Original file line number	Diff line number	Diff line change
`@@ -526,8 +526,8 @@ class ReshapeLayerImpl CV_FINAL : public ReshapeLayer`
`526`	`526`	`return Ptr<BackendNode>();`
`527`	`527`	`}`
`528`	`528`
`529`		`- virtual bool tryQuantize(const std::vector<std::vector<float> > &scales,`
`530`		`- const std::vector<std::vector<int> > &zeropoints, LayerParams& params) CV_OVERRIDE`
	`529`	`+ bool tryQuantize(const std::vector<std::vector<float> > &scales,`
	`530`	`+ const std::vector<std::vector<int> > &zeropoints, LayerParams& params) CV_OVERRIDE`
`531`	`531`	`{`
`532`	`532`	`return true;`
`533`	`533`	`}`
Original file line number	Diff line number	Diff line change
`@@ -444,8 +444,8 @@ class ResizeLayerImpl : public ResizeLayer`
`444`	`444`	`}`
`445`	`445`	`#endif`
`446`	`446`
`447`		`- virtual bool tryQuantize(const std::vector<std::vector<float> > &scales,`
`448`		`- const std::vector<std::vector<int> > &zeropoints, LayerParams& params) CV_OVERRIDE`
	`447`	`+ bool tryQuantize(const std::vector<std::vector<float> > &scales,`
	`448`	`+ const std::vector<std::vector<int> > &zeropoints, LayerParams& params) CV_OVERRIDE`
`449`	`449`	`{`
`450`	`450`	`return true;`
`451`	`451`	`}`
Original file line number	Diff line number	Diff line change
`@@ -419,8 +419,8 @@ class ScaleLayerImpl CV_FINAL : public ScaleLayer`
`419`	`419`	`shift = (hasBias && !blobs.empty()) ? blobs.back() : Mat();`
`420`	`420`	`}`
`421`	`421`
`422`		`- virtual bool tryQuantize(const std::vector<std::vector<float> > &scales,`
`423`		`- const std::vector<std::vector<int> > &zeropoints, LayerParams& params) CV_OVERRIDE`
	`422`	`+ bool tryQuantize(const std::vector<std::vector<float> > &scales,`
	`423`	`+ const std::vector<std::vector<int> > &zeropoints, LayerParams& params) CV_OVERRIDE`
`424`	`424`	`{`
`425`	`425`	`params.set("input_scales", DictValue::arrayReal(scales[0].data(), scales[0].size()));`
`426`	`426`	`params.set("input_zeropoints", DictValue::arrayInt(zeropoints[0].data(), zeropoints[0].size()));`
Original file line number	Diff line number	Diff line change
`@@ -147,8 +147,8 @@ class ShuffleChannelLayerImpl CV_FINAL : public ShuffleChannelLayer`
`147`	`147`	`}`
`148`	`148`	`#endif`
`149`	`149`
`150`		`- virtual bool tryQuantize(const std::vector<std::vector<float> > &scales,`
`151`		`- const std::vector<std::vector<int> > &zeropoints, LayerParams& params) CV_OVERRIDE`
	`150`	`+ bool tryQuantize(const std::vector<std::vector<float> > &scales,`
	`151`	`+ const std::vector<std::vector<int> > &zeropoints, LayerParams& params) CV_OVERRIDE`
`152`	`152`	`{`
`153`	`153`	`return true;`
`154`	`154`	`}`
Original file line number	Diff line number	Diff line change
`@@ -813,8 +813,8 @@ class SliceLayerImpl : public SliceLayer`
`813`	`813`	`}`
`814`	`814`	`#endif`
`815`	`815`
`816`		`- virtual bool tryQuantize(const std::vector<std::vector<float> > &scales,`
`817`		`- const std::vector<std::vector<int> > &zeropoints, LayerParams& params) CV_OVERRIDE`
	`816`	`+ bool tryQuantize(const std::vector<std::vector<float> > &scales,`
	`817`	`+ const std::vector<std::vector<int> > &zeropoints, LayerParams& params) CV_OVERRIDE`
`818`	`818`	`{`
`819`	`819`	`const int numOutputs = scales[1].size();`
`820`	`820`	`for (int i = 0; i < numOutputs; i++)`
Original file line number	Diff line number	Diff line change
`@@ -117,8 +117,8 @@ class SplitLayerImpl CV_FINAL : public SplitLayer`
`117`	`117`	`}`
`118`	`118`	`#endif`
`119`	`119`
`120`		`- virtual bool tryQuantize(const std::vector<std::vector<float> > &scales,`
`121`		`- const std::vector<std::vector<int> > &zeropoints, LayerParams& params) CV_OVERRIDE`
	`120`	`+ bool tryQuantize(const std::vector<std::vector<float> > &scales,`
	`121`	`+ const std::vector<std::vector<int> > &zeropoints, LayerParams& params) CV_OVERRIDE`
`122`	`122`	`{`
`123`	`123`	`const int numOutputs = scales[1].size();`
`124`	`124`	`for (int i = 0; i < numOutputs; i++)`