diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/bridge/colors.cpp | 2 | ||||
-rw-r--r-- | src/config/config.cpp | 1 | ||||
-rw-r--r-- | src/irc/irc_channel.cpp | 1 | ||||
-rw-r--r-- | src/irc/irc_client.cpp | 1 | ||||
-rw-r--r-- | src/logger/logger.cpp | 1 | ||||
-rw-r--r-- | src/utils/make_unique.hpp | 78 | ||||
-rw-r--r-- | src/xmpp/xmpp_component.cpp | 1 |
7 files changed, 0 insertions, 85 deletions
diff --git a/src/bridge/colors.cpp b/src/bridge/colors.cpp index aff001e..49f7a39 100644 --- a/src/bridge/colors.cpp +++ b/src/bridge/colors.cpp @@ -1,9 +1,7 @@ #include <bridge/colors.hpp> #include <xmpp/xmpp_stanza.hpp> -#include <utils/make_unique.hpp> #include <algorithm> - #include <iostream> #include <string.h> diff --git a/src/config/config.cpp b/src/config/config.cpp index 82295d5..e2e027b 100644 --- a/src/config/config.cpp +++ b/src/config/config.cpp @@ -1,4 +1,3 @@ -#include <utils/make_unique.hpp> #include <config/config.hpp> #include <iostream> diff --git a/src/irc/irc_channel.cpp b/src/irc/irc_channel.cpp index 7b0e766..2c0f8b1 100644 --- a/src/irc/irc_channel.cpp +++ b/src/irc/irc_channel.cpp @@ -1,5 +1,4 @@ #include <irc/irc_channel.hpp> -#include <utils/make_unique.hpp> IrcChannel::IrcChannel(): joined(false), diff --git a/src/irc/irc_client.cpp b/src/irc/irc_client.cpp index f077e37..e70dbe4 100644 --- a/src/irc/irc_client.cpp +++ b/src/irc/irc_client.cpp @@ -3,7 +3,6 @@ #include <bridge/bridge.hpp> #include <irc/irc_user.hpp> -#include <utils/make_unique.hpp> #include <logger/logger.hpp> #include <utils/tolower.hpp> #include <utils/split.hpp> diff --git a/src/logger/logger.cpp b/src/logger/logger.cpp index 22d83bd..7336579 100644 --- a/src/logger/logger.cpp +++ b/src/logger/logger.cpp @@ -1,4 +1,3 @@ -#include <utils/make_unique.hpp> #include <logger/logger.hpp> #include <config/config.hpp> 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 <nate@binkert.org> - * - * 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 <memory> - -namespace std { -namespace detail { - -// helper to construct a non-array unique_ptr -template <typename T> -struct make_unique_helper { - typedef std::unique_ptr<T> unique_ptr; - - template <typename... Args> - static inline unique_ptr make(Args&&... args) { - return unique_ptr(new T(std::forward<Args>(args)...)); - } -}; - -// helper to construct an array unique_ptr -template<typename T> -struct make_unique_helper<T[]> { - typedef std::unique_ptr<T[]> unique_ptr; - - template <typename... Args> - static inline unique_ptr make(Args&&... args) { - return unique_ptr(new T[sizeof...(Args)]{std::forward<Args>(args)...}); -} -}; - -// helper to construct an array unique_ptr with specified extent -template<typename T, std::size_t N> -struct make_unique_helper<T[N]> { - typedef std::unique_ptr<T[]> unique_ptr; - - template <typename... Args> - static inline unique_ptr make(Args&&... args) { - static_assert(N >= sizeof...(Args), - "For make_unique<T[N]> N must be as largs as the number of arguments"); - return unique_ptr(new T[N]{std::forward<Args>(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 <typename T, typename... Args> -inline typename detail::make_unique_helper<T>::unique_ptr -make_unique(Args&&... args) { - return detail::make_unique_helper<T>::make(std::forward<Args>(args)...); -} - -} // namespace std - -#endif // __MAKE_UNIQUE_HH__ diff --git a/src/xmpp/xmpp_component.cpp b/src/xmpp/xmpp_component.cpp index 9ad2c61..60b12dd 100644 --- a/src/xmpp/xmpp_component.cpp +++ b/src/xmpp/xmpp_component.cpp @@ -1,4 +1,3 @@ -#include <utils/make_unique.hpp> #include <utils/scopeguard.hpp> #include <logger/logger.hpp> |