diff options
| -rw-r--r-- | src/common/Utilities/Containers.h | 25 | ||||
| -rw-r--r-- | src/common/Utilities/IteratorPair.h | 57 | ||||
| -rw-r--r-- | src/common/Utilities/Util.h | 7 |
3 files changed, 64 insertions, 25 deletions
diff --git a/src/common/Utilities/Containers.h b/src/common/Utilities/Containers.h index a2b42011bd8..dea76ce58bb 100644 --- a/src/common/Utilities/Containers.h +++ b/src/common/Utilities/Containers.h @@ -186,31 +186,6 @@ namespace Trinity return itr != map.end() ? AddressOrSelf(itr->second) : nullptr; } - /** - * @class IteratorPair - * - * @brief Utility class to enable range for loop syntax for multimap.equal_range uses - */ - template<class iterator> - class IteratorPair - { - public: - IteratorPair() : _iterators() { } - IteratorPair(std::pair<iterator, iterator> iterators) : _iterators(iterators) { } - - iterator begin() const { return _iterators.first; } - iterator end() const { return _iterators.second; } - - private: - std::pair<iterator, iterator> _iterators; - }; - - template<class M> - inline auto MapEqualRange(M& map, typename M::key_type const& key) -> IteratorPair<decltype(map.begin())> - { - return { map.equal_range(key) }; - } - template<class K, class V, template<class, class, class...> class M, class... Rest> void MultimapErasePair(M<K, V, Rest...>& multimap, K const& key, V const& value) { diff --git a/src/common/Utilities/IteratorPair.h b/src/common/Utilities/IteratorPair.h new file mode 100644 index 00000000000..894e1637a71 --- /dev/null +++ b/src/common/Utilities/IteratorPair.h @@ -0,0 +1,57 @@ +/* + * Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef IteratorPair_h__ +#define IteratorPair_h__ + +#include "Define.h" +#include <utility> + +namespace Trinity +{ + /** + * @class IteratorPair + * + * @brief Utility class to enable range for loop syntax for multimap.equal_range uses + */ + template<class iterator> + class IteratorPair + { + public: + IteratorPair() : _iterators() { } + IteratorPair(std::pair<iterator, iterator> iterators) : _iterators(iterators) { } + + iterator begin() const { return _iterators.first; } + iterator end() const { return _iterators.second; } + + private: + std::pair<iterator, iterator> _iterators; + }; + + namespace Containers + { + template<class M> + inline auto MapEqualRange(M& map, typename M::key_type const& key) -> IteratorPair<decltype(map.begin())> + { + return { map.equal_range(key) }; + } + } + //! namespace Containers +} +//! namespace Trinity + +#endif // IteratorPair_h__ diff --git a/src/common/Utilities/Util.h b/src/common/Utilities/Util.h index eac0611f913..92e0a37b0a3 100644 --- a/src/common/Utilities/Util.h +++ b/src/common/Utilities/Util.h @@ -537,4 +537,11 @@ bool CompareValues(ComparisionType type, T val1, T val2) } } +template<typename E> +typename std::underlying_type<E>::type AsUnderlyingType(E enumValue) +{ + static_assert(std::is_enum<E>::value, "AsUnderlyingType can only be used with enums"); + return static_cast<typename std::underlying_type<E>::type>(enumValue); +} + #endif |