mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-26 04:00:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #19021 from alalek:4.x_build_warnings_gcc_4.8.5

Browse Source
This commit is contained in:
Alexander Alekhin 2020-12-06 17:22:45 +00:00
commit 31619faa70
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/dnn/include/opencv2/dnn/dnn.inl.hpp
View File

@ -247,6 +247,7 @@ inline DictValue & DictValue::operator=(const DictValue &r)
}
inline DictValue::DictValue(const DictValue &r)
: pv(NULL)
{
type = r.type;

10
modules/gapi/include/opencv2/gapi/util/optional.hpp
View File

@ -35,9 +35,9 @@ namespace util
// instead {}
optional() {};
optional(const optional&) = default;
explicit optional(T &&value) noexcept;
explicit optional(const T &value) noexcept;
optional(optional &&) noexcept;
explicit optional(T&&) noexcept;
explicit optional(const T&) noexcept;
optional(optional&&) noexcept;
// TODO: optional(nullopt_t) noexcept;
// TODO: optional(const optional<U> &)
// TODO: optional(optional<U> &&)
@ -46,8 +46,8 @@ namespace util
// TODO: optional(U&& value);
// Assignment
optional& operator=(const optional& rhs) = default;
optional& operator=(optional&& rhs);
optional& operator=(const optional&) = default;
optional& operator=(optional&&);
// Observers
T* operator-> ();