Commit ccf98845 authored by Yedidya Feldblum's avatar Yedidya Feldblum Committed by Facebook GitHub Bot

assume gcc > 7 in UniqueInstance

Summary: Reverts {D28111907 (https://github.com/facebook/folly/commit/f35ba916372e02d67781d1529b19d49300fa4070)}.

Differential Revision: D28121832

fbshipit-source-id: 12871812fa34d2ef7d33b91908ffcb5e0a44b1a9
parent e8ccd7a4
...@@ -27,9 +27,6 @@ namespace detail { ...@@ -27,9 +27,6 @@ namespace detail {
class UniqueInstance { class UniqueInstance {
public: public:
#if __GNUC__ && __GNUC__ < 7 && !__clang__
explicit UniqueInstance(...) noexcept {}
#else
template <template <typename...> class Z, typename... Key, typename... Mapped> template <template <typename...> class Z, typename... Key, typename... Mapped>
FOLLY_EXPORT FOLLY_ALWAYS_INLINE explicit UniqueInstance( FOLLY_EXPORT FOLLY_ALWAYS_INLINE explicit UniqueInstance(
tag_t<Z<Key..., Mapped...>>, tag_t<Key...>, tag_t<Mapped...>) noexcept { tag_t<Z<Key..., Mapped...>>, tag_t<Key...>, tag_t<Mapped...>) noexcept {
...@@ -41,7 +38,6 @@ class UniqueInstance { ...@@ -41,7 +38,6 @@ class UniqueInstance {
{tag<Value, key_t<Z, Key...>>}}; {tag<Value, key_t<Z, Key...>>}};
enforce(arg); enforce(arg);
} }
#endif
UniqueInstance(UniqueInstance const&) = delete; UniqueInstance(UniqueInstance const&) = delete;
UniqueInstance(UniqueInstance&&) = delete; UniqueInstance(UniqueInstance&&) = delete;
......
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