From 4fc71e97089d5113a2dc7bb22c5ae2b498aebf16 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 6 Sep 2015 02:39:35 -0400 Subject: Common: Remove StdMakeUnique.h --- Source/Core/Common/Common.vcxproj | 1 - Source/Core/Common/Common.vcxproj.filters | 1 - Source/Core/Common/StdMakeUnique.h | 82 ------------------------------- 3 files changed, 84 deletions(-) delete mode 100644 Source/Core/Common/StdMakeUnique.h (limited to 'Source/Core/Common') diff --git a/Source/Core/Common/Common.vcxproj b/Source/Core/Common/Common.vcxproj index 9303e37939..ec67edf054 100644 --- a/Source/Core/Common/Common.vcxproj +++ b/Source/Core/Common/Common.vcxproj @@ -75,7 +75,6 @@ - diff --git a/Source/Core/Common/Common.vcxproj.filters b/Source/Core/Common/Common.vcxproj.filters index 712122b3d1..64c29fb0ab 100644 --- a/Source/Core/Common/Common.vcxproj.filters +++ b/Source/Core/Common/Common.vcxproj.filters @@ -46,7 +46,6 @@ - diff --git a/Source/Core/Common/StdMakeUnique.h b/Source/Core/Common/StdMakeUnique.h deleted file mode 100644 index b3e38649d8..0000000000 --- a/Source/Core/Common/StdMakeUnique.h +++ /dev/null @@ -1,82 +0,0 @@ -// Copyright 2014 Dolphin Emulator Project -// Licensed under GPLv2+ -// Refer to the license.txt file included. - -#pragma once - -// VS 2013 defines __cplusplus as 199711L but has std::make_unique. -#if __cplusplus > 201103L || _MSC_VER >= 1800 -#include -#else - -// Implementation of C++14 std::make_unique, which is not supported by all the -// compilers we care about yet. -// -// NOTE: This code is based on the libc++ implementation of std::make_unique. -// -// Copyright (c) 2009-2014 by the libc++ contributors. -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. - -#include -#include -#include - -namespace std -{ - -struct unspecified {}; - -template -struct unique_if -{ - typedef std::unique_ptr unique_single; -}; - -template -struct unique_if -{ - typedef std::unique_ptr unique_array_unknown_bound; -}; - -template -struct unique_if -{ - typedef void unique_array_known_bound; -}; - -template -inline typename unique_if::unique_single make_unique(Args&&... args) -{ - return std::unique_ptr(new T(std::forward(args)...)); -} - -template -inline typename unique_if::unique_array_unknown_bound make_unique(size_t n) -{ - typedef typename std::remove_extent::type U; - return std::unique_ptr(new U[n]()); -} - -template -typename unique_if::unique_array_known_bound make_unique(Args&&...) = delete; - -} // namespace std - -#endif // __cplusplus -- cgit v1.2.3