From 5d74e02286215f8cfd9824d51d2ad30c3d04219c Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 12 Mar 2016 14:40:28 -0500 Subject: [PATCH 1/2] NonCopyable: Specify const in copy constructor/assignment signatures --- Source/Core/Common/NonCopyable.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Common/NonCopyable.h b/Source/Core/Common/NonCopyable.h index 9fc1456a4e..73c27271bd 100644 --- a/Source/Core/Common/NonCopyable.h +++ b/Source/Core/Common/NonCopyable.h @@ -12,6 +12,6 @@ protected: ~NonCopyable() = default; private: - NonCopyable(NonCopyable&) = delete; - NonCopyable& operator=(NonCopyable&) = delete; + NonCopyable(const NonCopyable&) = delete; + NonCopyable& operator=(const NonCopyable&) = delete; }; From 2ce6b449d184bd0e86932a119c281c652c22e4f0 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 12 Mar 2016 14:41:18 -0500 Subject: [PATCH 2/2] NonCopyable: Remove private access specifier This isn't necessary, as the member functions are deleted. If someone tries to perform a copy, the compiler will now indicate that the member functions/constructors are deleted, rather than inaccessible. --- Source/Core/Common/NonCopyable.h | 1 - 1 file changed, 1 deletion(-) diff --git a/Source/Core/Common/NonCopyable.h b/Source/Core/Common/NonCopyable.h index 73c27271bd..f0f14bad09 100644 --- a/Source/Core/Common/NonCopyable.h +++ b/Source/Core/Common/NonCopyable.h @@ -11,7 +11,6 @@ protected: constexpr NonCopyable() = default; ~NonCopyable() = default; -private: NonCopyable(const NonCopyable&) = delete; NonCopyable& operator=(const NonCopyable&) = delete; };