2 files changed, 116 insertions, 3 deletions
diff --git a/src/common/Utilities/Containers.h b/src/common/Utilities/Containers.h
index cf23949c10a..581fbfabe6b 100644
--- a/src/common/Utilities/Containers.h
+++ b/src/common/Utilities/Containers.h
@@ -118,7 +118,7 @@ namespace Trinity
          * Note: container cannot be empty
          */
         template<class C, class Fn>
-        auto SelectRandomWeightedContainerElement(C const& container, Fn weightExtractor) -> decltype(std::begin(container))
+        inline auto SelectRandomWeightedContainerElement(C const& container, Fn weightExtractor) -> decltype(std::begin(container))
         {
             std::vector<double> weights;
             weights.reserve(Size(container));
@@ -161,7 +161,7 @@ namespace Trinity
          * @return true if containers have a common element, false otherwise.
         */
         template<class Iterator1, class Iterator2>
-        bool Intersects(Iterator1 first1, Iterator1 last1, Iterator2 first2, Iterator2 last2)
+        inline bool Intersects(Iterator1 first1, Iterator1 last1, Iterator2 first2, Iterator2 last2)
         {
             while (first1 != last1 && first2 != last2)
             {
@@ -177,6 +177,37 @@ namespace Trinity
         }
 
         /**
+         * @fn bool Trinity::Containers::Intersects(Iterator first1, Iterator last1, Iterator first2, Iterator last2, Predicate&& equalPred)
+         *
+         * @brief Checks if two SORTED containers have a common element
+         *
+         * @param first1 Iterator pointing to start of the first container
+         * @param last1 Iterator pointing to end of the first container
+         * @param first2 Iterator pointing to start of the second container
+         * @param last2 Iterator pointing to end of the second container
+         * @param equalPred Additional predicate to exclude elements
+         *
+         * @return true if containers have a common element, false otherwise.
+        */
+        template<class Iterator1, class Iterator2, class Predicate>
+        inline bool Intersects(Iterator1 first1, Iterator1 last1, Iterator2 first2, Iterator2 last2, Predicate&& equalPred)
+        {
+            while (first1 != last1 && first2 != last2)
+            {
+                if (*first1 < *first2)
+                    ++first1;
+                else if (*first2 < *first1)
+                    ++first2;
+                else if (!equalPred(*first1, *first2))
+                    ++first1, ++first2;
+                else
+                    return true;
+            }
+
+            return false;
+        }
+
+        /**
          * Returns a pointer to mapped value (or the value itself if map stores pointers)
          */
         template<class M>
@@ -187,7 +218,7 @@ namespace Trinity
         }
 
         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)
+        inline void MultimapErasePair(M<K, V, Rest...>& multimap, K const& key, V const& value)
         {
             auto range = multimap.equal_range(key);
             for (auto itr = range.first; itr != range.second;)
diff --git a/src/common/Utilities/EnumClassFlag.h b/src/common/Utilities/EnumClassFlag.h
new file mode 100644
index 00000000000..68ee56edb07
--- /dev/null
+++ b/src/common/Utilities/EnumClassFlag.h
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2008-2018 TrinityCore <https://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 EnumClassFlag_h__
+#define EnumClassFlag_h__
+
+#include <type_traits>
+
+template<typename T>
+class EnumClassFlag
+{
+    static_assert(std::is_enum<T>::value, "EnumClassFlag must be used only with enums");
+
+public:
+    /*implicit*/ EnumClassFlag(T value) : _value(value) { }
+
+    EnumClassFlag& operator&=(EnumClassFlag right)
+    {
+        _value = static_cast<T>(static_cast<std::underlying_type_t<T>>(_value) & static_cast<std::underlying_type_t<T>>(right._value));
+        return *this;
+    }
+
+    friend EnumClassFlag operator&(EnumClassFlag left, EnumClassFlag right)
+    {
+        return left &= right;
+    }
+
+    EnumClassFlag operator|=(EnumClassFlag right)
+    {
+        _value = static_cast<T>(static_cast<std::underlying_type_t<T>>(_value) | static_cast<std::underlying_type_t<T>>(right._value));
+        return *this;
+    }
+
+    friend EnumClassFlag operator|(EnumClassFlag left, EnumClassFlag right)
+    {
+        return left |= right;
+    }
+
+    EnumClassFlag operator~() const
+    {
+        return static_cast<T>(~static_cast<std::underlying_type_t<T>>(_value));
+    }
+
+    void RemoveFlag(EnumClassFlag flag)
+    {
+        _value = static_cast<T>(static_cast<std::underlying_type_t<T>>(_value) & ~static_cast<std::underlying_type_t<T>>(flag._value));
+    }
+
+    bool HasFlag(T flag) const
+    {
+        return (static_cast<std::underlying_type_t<T>>(_value) & static_cast<std::underlying_type_t<T>>(flag)) != 0;
+    }
+
+    operator T() const
+    {
+        return _value;
+    }
+
+    std::underlying_type_t<T> AsUnderlyingType() const
+    {
+        return static_cast<std::underlying_type_t<T>>(_value);
+    }
+
+private:
+    T _value;
+};
+
+#endif // EnumClassFlag_h__