From 221803182695d393d2a076c3833900c240499310 Mon Sep 17 00:00:00 2001 From: Sven Over Date: Tue, 4 Apr 2017 09:53:30 -0700 Subject: [PATCH] Function.h: remove FOLLY_MSVC_DISABLE_WARNING Summary: We recently removed declarations of Function constructors and assignment operators that took non-const Function references. They were necessary at the time to make sure that the templated constructor that can take any invokable object did not get selected for copying Functions from non-const lvalues. This, however, is now provided by some std::enable_if construct. Reviewed By: ericniebler Differential Revision: D4818736 fbshipit-source-id: 08197721beef009f6ae482b576df78ec6999d132 --- folly/Function.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/folly/Function.h b/folly/Function.h index a55381fb..5f0d748c 100644 --- a/folly/Function.h +++ b/folly/Function.h @@ -424,9 +424,6 @@ inline auto invoke(M(C::*d), Args&&... args) } // namespace function } // namespace detail -FOLLY_PUSH_WARNING -FOLLY_MSVC_DISABLE_WARNING(4521) // Multiple copy constructors -FOLLY_MSVC_DISABLE_WARNING(4522) // Multiple assignment operators template class Function final : private detail::function::FunctionTraits { // These utility types are defined outside of the template to reduce @@ -700,7 +697,6 @@ class Function final : private detail::function::FunctionTraits { return std::move(*this).asSharedProxy(); } }; -FOLLY_POP_WARNING template void swap(Function& lhs, Function& rhs) noexcept { -- 2.34.1