From 184a970b722e16477a327a3810ea9ce01ca3891d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= <lynix680@gmail.com>
Date: Tue, 6 Jun 2017 16:50:09 +0200
Subject: [PATCH] Fix all flags..

---
 include/Nazara/Core/Flags.hpp |  5 +++
 include/Nazara/Core/Flags.inl | 62 +++++++++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+)

diff --git a/include/Nazara/Core/Flags.hpp b/include/Nazara/Core/Flags.hpp
index cb336def6..5285ef601 100644
--- a/include/Nazara/Core/Flags.hpp
+++ b/include/Nazara/Core/Flags.hpp
@@ -54,6 +54,11 @@ namespace Nz
 		private:
 			BitField m_value;
 	};
+
+	template<typename E> constexpr std::enable_if_t<EnumAsFlags<E>::value, Flags<E>> operator~(E lhs);
+	template<typename E> constexpr std::enable_if_t<EnumAsFlags<E>::value, Flags<E>> operator|(E lhs, E rhs);
+	template<typename E> constexpr std::enable_if_t<EnumAsFlags<E>::value, Flags<E>> operator&(E lhs, E rhs);
+	template<typename E> constexpr std::enable_if_t<EnumAsFlags<E>::value, Flags<E>> operator^(E lhs, E rhs);
 }
 
 template<typename E> constexpr std::enable_if_t<Nz::EnumAsFlags<E>::value, Nz::Flags<E>> operator~(E lhs);
diff --git a/include/Nazara/Core/Flags.inl b/include/Nazara/Core/Flags.inl
index 973da958d..3832d3b50 100644
--- a/include/Nazara/Core/Flags.inl
+++ b/include/Nazara/Core/Flags.inl
@@ -209,6 +209,68 @@ namespace Nz
 	{
 		return 1U << static_cast<BitField>(enumValue);
 	}
+
+
+	/*!
+	* \brief Override binary NOT operator on enum to turns into a Flags object.
+	* \return A Flags object with reversed bits.
+	*
+	* \param lhs Enumeration value to reverse.
+	*
+	* Returns a Flags object with all state enabled except for the enum one.
+	*/
+	template<typename E>
+	constexpr std::enable_if_t<EnumAsFlags<E>::value, Flags<E>> operator~(E lhs)
+	{
+		return ~Flags<E>(lhs);
+	}
+
+	/*!
+	* \brief Override binary OR operator on enum to turns into a Flags object.
+	* \return A Flags object with combined enum states.
+	*
+	* \param lhs First enumeration value to combine.
+	* \param rhs Second enumeration value to combine.
+	*
+	* Returns a Flags object with combined states from the two enumeration values.
+	*/
+	template<typename E>
+	constexpr std::enable_if_t<EnumAsFlags<E>::value, Flags<E>> operator|(E lhs, E rhs)
+	{
+		return Flags<E>(lhs) | rhs;
+	}
+
+	/*!
+	* \brief Override binary AND operator on enum to turns into a Flags object.
+	* \return A Flags object with compare enum states.
+	*
+	* \param lhs First enumeration value to compare.
+	* \param rhs Second enumeration value to compare.
+	*
+	* Returns a Flags object with compared states from the two enumeration values.
+	* In this case, only one flag will be enabled if both enumeration values are the same.
+	*/
+	template<typename E>
+	constexpr std::enable_if_t<EnumAsFlags<E>::value, Flags<E>> operator&(E lhs, E rhs)
+	{
+		return Flags<E>(lhs) & rhs;
+	}
+
+	/*!
+	* \brief Override binary XOR operator on enum to turns into a Flags object.
+	* \return A Flags object with XORed enum states.
+	*
+	* \param lhs First enumeration value to compare.
+	* \param rhs Second enumeration value to compare.
+	*
+	* Returns a Flags object with XORed states from the two enumeration values.
+	* In this case, two flags will be enabled if both the enumeration values are different.
+	*/
+	template<typename E>
+	constexpr std::enable_if_t<EnumAsFlags<E>::value, Flags<E>> operator^(E lhs, E rhs)
+	{
+		return Flags<E>(lhs) ^ rhs;
+	}
 }
 
 /*!