Commit c02179a7 authored by Andrey Kamaev's avatar Andrey Kamaev

Revert "_InputArray/_OutputArray destructors are temporary made non-virtual.…

Revert "_InputArray/_OutputArray destructors are temporary made non-virtual. Please, restore it after 2.4.3"

This reverts commit 4be7619c.
parent 62af76c6
...@@ -61,7 +61,7 @@ if(CMAKE_COMPILER_IS_GNUCXX) ...@@ -61,7 +61,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
add_extra_compiler_option(-W) add_extra_compiler_option(-W)
add_extra_compiler_option(-Wall) add_extra_compiler_option(-Wall)
add_extra_compiler_option(-Werror=return-type) add_extra_compiler_option(-Werror=return-type)
#add_extra_compiler_option(-Werror=non-virtual-dtor) add_extra_compiler_option(-Werror=non-virtual-dtor)
add_extra_compiler_option(-Werror=address) add_extra_compiler_option(-Werror=address)
add_extra_compiler_option(-Werror=sequence-point) add_extra_compiler_option(-Werror=sequence-point)
add_extra_compiler_option(-Wformat) add_extra_compiler_option(-Wformat)
......
...@@ -1340,7 +1340,7 @@ public: ...@@ -1340,7 +1340,7 @@ public:
virtual int channels(int i=-1) const; virtual int channels(int i=-1) const;
virtual bool empty() const; virtual bool empty() const;
/*virtual*/ ~_InputArray(); virtual ~_InputArray();
int flags; int flags;
void* obj; void* obj;
...@@ -1402,7 +1402,7 @@ public: ...@@ -1402,7 +1402,7 @@ public:
virtual void release() const; virtual void release() const;
virtual void clear() const; virtual void clear() const;
/*virtual*/ ~_OutputArray(); virtual ~_OutputArray();
}; };
typedef const _InputArray& InputArray; typedef const _InputArray& InputArray;
......
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