Merge pull request #14144 from alalek:issue_14143

6 years ago · ee7255aac4
parent 5dc606097c f75152a597
commit ee7255aac4
1 changed files with 4 additions and 2 deletions
--- a/modules/gapi/include/opencv2/gapi/util/variant.hpp
+++ b/modules/gapi/include/opencv2/gapi/util/variant.hpp
@ -328,7 +328,8 @@ namespace util
            util::type_list_index<T, Types...>::value;

        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
            throw_error(bad_variant_access());
    }
@ -340,7 +341,8 @@ namespace util
            util::type_list_index<T, Types...>::value;

        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
            throw_error(bad_variant_access());
    }