From 95cb1922093007914c2ba1946dd696150f6b1f48 Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Sun, 18 Aug 2013 03:20:57 -0700 Subject: [PATCH] Clean up combinations of buffered handshaking and future returns --- modules/beast_asio/basics/beast_HandlerCall.cpp | 15 --------------- modules/beast_asio/basics/beast_HandlerCall.h | 7 ------- 2 files changed, 22 deletions(-) diff --git a/modules/beast_asio/basics/beast_HandlerCall.cpp b/modules/beast_asio/basics/beast_HandlerCall.cpp index baf74121..71a9edae 100644 --- a/modules/beast_asio/basics/beast_HandlerCall.cpp +++ b/modules/beast_asio/basics/beast_HandlerCall.cpp @@ -216,21 +216,6 @@ HandlerCall& HandlerCall::operator= (HandlerCall const& other) noexcept return *this; } -#if BEAST_COMPILER_SUPPORTS_MOVE_SEMANTICS -HandlerCall::HandlerCall (HandlerCall&& other) noexcept - : m_call (other.m_call) -{ - other.m_call = nullptr; -} - -HandlerCall& HandlerCall::operator= (HandlerCall&& other) noexcept -{ - m_call = other.m_call; - other.m_call = nullptr; - return *this; -} -#endif - bool HandlerCall::isNull () const noexcept { return m_call == nullptr; diff --git a/modules/beast_asio/basics/beast_HandlerCall.h b/modules/beast_asio/basics/beast_HandlerCall.h index ddbe0b1f..037a02f6 100644 --- a/modules/beast_asio/basics/beast_HandlerCall.h +++ b/modules/beast_asio/basics/beast_HandlerCall.h @@ -33,9 +33,7 @@ Supports these concepts: DefaultConstructible - MoveConstructible (C++11) CopyConstructible - MoveAssignable (C++11) CopyAssignable Destructible */ @@ -324,11 +322,6 @@ public: /** @{ */ HandlerCall (HandlerCall const& other) noexcept; HandlerCall& operator= (HandlerCall const& other) noexcept; - -#if BEAST_COMPILER_SUPPORTS_MOVE_SEMANTICS - HandlerCall (HandlerCall&& other) noexcept; - HandlerCall& operator= (HandlerCall&& other) noexcept; -#endif /** @} */ //--------------------------------------------------------------------------