From 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Tue, 27 Jun 2017 06:07:23 +0000 Subject: webkitgtk-2.16.5 --- Source/WebCore/rendering/RenderPtr.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'Source/WebCore/rendering/RenderPtr.h') diff --git a/Source/WebCore/rendering/RenderPtr.h b/Source/WebCore/rendering/RenderPtr.h index ef069226f..d2cbba24c 100644 --- a/Source/WebCore/rendering/RenderPtr.h +++ b/Source/WebCore/rendering/RenderPtr.h @@ -23,8 +23,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef RenderPtr_h -#define RenderPtr_h +#pragma once #include #include @@ -109,7 +108,7 @@ template template inline RenderPtr::RenderPtr(RenderP template inline auto RenderPtr::operator=(RenderPtr&& o) -> RenderPtr& { ASSERT(!o || o != m_ptr); - RenderPtr ptr = std::move(o); + RenderPtr ptr = WTFMove(o); swap(ptr); return *this; } @@ -117,7 +116,7 @@ template inline auto RenderPtr::operator=(RenderPtr&& o) -> Rende template template inline auto RenderPtr::operator=(RenderPtr&& o) -> RenderPtr& { ASSERT(!o || o != m_ptr); - RenderPtr ptr = std::move(o); + RenderPtr ptr = WTFMove(o); swap(ptr); return *this; } @@ -177,5 +176,3 @@ template struct HashTraits> : SimpleClassHashT }; } // namespace WTF - -#endif // RenderPtr_h -- cgit v1.2.1