diff options
author | 2016-01-25 13:00:33 -0800 | |
---|---|---|
committer | 2016-01-25 13:00:34 -0800 | |
commit | 1fce5584cfd7c9cc36388b9d250f03d56ee9b254 (patch) | |
tree | a8061ced3cf7f28fbbb0ae68d83673ac79814053 | |
parent | 7869bbff26b75a34ff8f56c9dfdaa98476adb6cb (diff) |
Work around vs2013sp2-3 bug in skstd::unique_ptr.
When compiling skstd::unique_ptr::compressed_base with the vc++ in
some intermediate service pack versions of Visual Studio 2013 the
compiler will crash with an internal compiler error. In the interest of
reducing headaches, work around this issue in skstd::unique_ptr until
std::unique_ptr can be used.
BUG=skia:4564
Review URL: https://codereview.chromium.org/1636503002
-rw-r--r-- | include/private/SkUniquePtr.h | 41 |
1 files changed, 24 insertions, 17 deletions
diff --git a/include/private/SkUniquePtr.h b/include/private/SkUniquePtr.h index d87ce29480..b1097d51eb 100644 --- a/include/private/SkUniquePtr.h +++ b/include/private/SkUniquePtr.h @@ -48,7 +48,7 @@ public: using deleter_type = D; private: - template <typename B, bool = std::is_empty<B>::value /*&& !is_final<B>::value*/> + template <typename B, bool> struct compressed_base : private B { /*constexpr*/ compressed_base() : B() {} /*constexpr*/ compressed_base(const B& b) : B(b) {} @@ -68,25 +68,29 @@ private: void swap(compressed_base& that) /*noexcept*/ { SkTSwap(fb, that.fB); } }; - struct compressed_data : private compressed_base<deleter_type> { + // C++14 adds '&& !std::is_final<deleter_type>::value' to the bool condition. + // compressed_base_t exists and has this form to work around a bug in vs2013sp2-3 + using compressed_base_t = compressed_base<deleter_type, std::is_empty<deleter_type>::value>; + + struct compressed_data : private compressed_base_t { pointer fPtr; - /*constexpr*/ compressed_data() : compressed_base<deleter_type>(), fPtr() {} + /*constexpr*/ compressed_data() : compressed_base_t(), fPtr() {} /*constexpr*/ compressed_data(const pointer& ptr, const deleter_type& d) - : compressed_base<deleter_type>(d), fPtr(ptr) {} + : compressed_base_t(d), fPtr(ptr) {} template <typename U1, typename U2, typename = enable_if_t< is_convertible<U1, pointer>::value && is_convertible<U2, deleter_type>::value >> /*constexpr*/ compressed_data(U1&& ptr, U2&& d) - : compressed_base<deleter_type>(std::forward<U2>(d)), fPtr(std::forward<U1>(ptr)) {} + : compressed_base_t(std::forward<U2>(d)), fPtr(std::forward<U1>(ptr)) {} /*constexpr*/ pointer& getPointer() /*noexcept*/ { return fPtr; } /*constexpr*/ pointer const& getPointer() const /*noexcept*/ { return fPtr; } /*constexpr*/ deleter_type& getDeleter() /*noexcept*/ { - return compressed_base<deleter_type>::get(); + return compressed_base_t::get(); } /*constexpr*/ deleter_type const& getDeleter() const /*noexcept*/ { - return compressed_base<deleter_type>::get(); + return compressed_base_t::get(); } void swap(compressed_data& that) /*noexcept*/ { - compressed_base<deleter_type>::swap(static_cast<compressed_base<deleter_type>>(that)); + compressed_base_t::swap(static_cast<compressed_base_t>(that)); SkTSwap(fPtr, that.fPtr); } }; @@ -221,8 +225,7 @@ public: using deleter_type = D; private: - template <typename B, bool = std::is_empty<B>::value /*&& !is_final<B>::value*/> - struct compressed_base : private B { + template <typename B, bool> struct compressed_base : private B { /*constexpr*/ compressed_base() : B() {} /*constexpr*/ compressed_base(const B& b) : B(b) {} /*constexpr*/ compressed_base(B&& b) : B(std::move(b)) {} @@ -241,25 +244,29 @@ private: void swap(compressed_base& that) /*noexcept*/ { SkTSwap(fb, that.fB); } }; - struct compressed_data : private compressed_base<deleter_type> { + // C++14 adds '&& !std::is_final<deleter_type>::value' to the bool condition. + // compressed_base_t exists and has this form to work around a bug in vs2013sp2-3 + using compressed_base_t = compressed_base<deleter_type, std::is_empty<deleter_type>::value>; + + struct compressed_data : private compressed_base_t { pointer fPtr; - /*constexpr*/ compressed_data() : compressed_base<deleter_type>(), fPtr() {} + /*constexpr*/ compressed_data() : compressed_base_t(), fPtr() {} /*constexpr*/ compressed_data(const pointer& ptr, const deleter_type& d) - : compressed_base<deleter_type>(d), fPtr(ptr) {} + : compressed_base_t(d), fPtr(ptr) {} template <typename U1, typename U2, typename = enable_if_t< is_convertible<U1, pointer>::value && is_convertible<U2, deleter_type>::value >> /*constexpr*/ compressed_data(U1&& ptr, U2&& d) - : compressed_base<deleter_type>(std::forward<U2>(d)), fPtr(std::forward<U1>(ptr)) {} + : compressed_base_t(std::forward<U2>(d)), fPtr(std::forward<U1>(ptr)) {} /*constexpr*/ pointer& getPointer() /*noexcept*/ { return fPtr; } /*constexpr*/ pointer const& getPointer() const /*noexcept*/ { return fPtr; } /*constexpr*/ deleter_type& getDeleter() /*noexcept*/ { - return compressed_base<deleter_type>::get(); + return compressed_base_t::get(); } /*constexpr*/ deleter_type const& getDeleter() const /*noexcept*/ { - return compressed_base<deleter_type>::get(); + return compressed_base_t::get(); } void swap(compressed_data& that) /*noexcept*/ { - compressed_base<deleter_type>::swap(static_cast<compressed_base<deleter_type>>(that)); + compressed_base_t::swap(static_cast<compressed_base_t>(that)); SkTSwap(fPtr, that.fPtr); } }; |