mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-12 04:12:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #14144 from alalek:issue_14143

Browse Source
This commit is contained in:
Alexander Alekhin 2019-04-03 14:35:54 +00:00
commit ee7255aac4
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/gapi/include/opencv2/gapi/util/variant.hpp
View File

@ -328,7 +328,8 @@ namespace util
util::type_list_index<T, Types...>::value; util::type_list_index<T, Types...>::value;
if (v.index() == t_index) if (v.index() == t_index)
return reinterpret_cast<T&>(v.memory); return *(T*)(&v.memory); // workaround for ICC 2019
// original code: return reinterpret_cast<T&>(v.memory);
else else
throw_error(bad_variant_access()); throw_error(bad_variant_access());
} }
@ -340,7 +341,8 @@ namespace util
util::type_list_index<T, Types...>::value; util::type_list_index<T, Types...>::value;
if (v.index() == t_index) if (v.index() == t_index)
return reinterpret_cast<const T&>(v.memory); return *(const T*)(&v.memory); // workaround for ICC 2019
// original code: return reinterpret_cast<const T&>(v.memory);
else else
throw_error(bad_variant_access()); throw_error(bad_variant_access());
} }