From c6059e5a215624e205cae401183f3a8bb1bf87d0 Mon Sep 17 00:00:00 2001 From: Florent Le Coz Date: Mon, 28 Apr 2014 18:46:25 +0200 Subject: Upgrade to C++14 --- src/utils/make_unique.hpp | 78 ----------------------------------------------- 1 file changed, 78 deletions(-) delete mode 100644 src/utils/make_unique.hpp (limited to 'src/utils') diff --git a/src/utils/make_unique.hpp b/src/utils/make_unique.hpp deleted file mode 100644 index 67964c8..0000000 --- a/src/utils/make_unique.hpp +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright (c) 2012 Nathan L. Binkert - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#ifndef __MAKE_UNIQUE_HH__ -#define __MAKE_UNIQUE_HH__ - -#include - -namespace std { -namespace detail { - -// helper to construct a non-array unique_ptr -template -struct make_unique_helper { - typedef std::unique_ptr unique_ptr; - - template - static inline unique_ptr make(Args&&... args) { - return unique_ptr(new T(std::forward(args)...)); - } -}; - -// helper to construct an array unique_ptr -template -struct make_unique_helper { - typedef std::unique_ptr unique_ptr; - - template - static inline unique_ptr make(Args&&... args) { - return unique_ptr(new T[sizeof...(Args)]{std::forward(args)...}); -} -}; - -// helper to construct an array unique_ptr with specified extent -template -struct make_unique_helper { - typedef std::unique_ptr unique_ptr; - - template - static inline unique_ptr make(Args&&... args) { - static_assert(N >= sizeof...(Args), - "For make_unique N must be as largs as the number of arguments"); - return unique_ptr(new T[N]{std::forward(args)...}); - } - -#if __GNUC__ == 4 && __GNUC_MINOR__ <= 6 - // G++ 4.6 has an ICE when you have no arguments - static inline unique_ptr make() { - return unique_ptr(new T[N]); - } -#endif -}; - - -} // namespace detail - -template -inline typename detail::make_unique_helper::unique_ptr -make_unique(Args&&... args) { - return detail::make_unique_helper::make(std::forward(args)...); -} - -} // namespace std - -#endif // __MAKE_UNIQUE_HH__ -- cgit v1.2.3