From 49d59d93d8ac4718394a6d7d71083f5657a418b9 Mon Sep 17 00:00:00 2001
From: Lynix <lynix680@gmail.com>
Date: Fri, 3 Aug 2018 23:56:52 +0200
Subject: [PATCH] Revert "Core/Flags: Make operators |= &= and ^= constexpr"

This reverts commit a363ae312fc951ba3b9e06e7e67a32bc05e6e879.
---
 ChangeLog.md                  | 3 ---
 include/Nazara/Core/Flags.hpp | 6 +++---
 include/Nazara/Core/Flags.inl | 6 +++---
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index 7eb3ce88c..8514bbf26 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -130,9 +130,6 @@ Nazara Engine:
 - Fixed bug where index wouldn't be used in String::FindLast and String::FindWord
 - Physics 2D contact callbacks now include an arbiter allowing to query/set parameters about the collision
 - Added movement with Ctrl in TextAreaWidget
-- Added Unicode Data downloader/parser
-- Integrated Unicode Data
-- Fixed Flags operator |=/&=/^= not being constexpr
 
 Nazara Development Kit:
 - Added ImageWidget (#139)
diff --git a/include/Nazara/Core/Flags.hpp b/include/Nazara/Core/Flags.hpp
index 189ec5c9c..92c97de9e 100644
--- a/include/Nazara/Core/Flags.hpp
+++ b/include/Nazara/Core/Flags.hpp
@@ -61,9 +61,9 @@ namespace Nz
 			constexpr bool operator==(const Flags& rhs) const;
 			constexpr bool operator!=(const Flags& rhs) const;
 
-			constexpr Flags& operator|=(const Flags& rhs);
-			constexpr Flags& operator&=(const Flags& rhs);
-			constexpr Flags& operator^=(const Flags& rhs);
+			/*constexpr*/ Flags& operator|=(const Flags& rhs);
+			/*constexpr*/ Flags& operator&=(const Flags& rhs);
+			/*constexpr*/ Flags& operator^=(const Flags& rhs);
 
 			static constexpr BitField GetFlagValue(E enumValue);
 
diff --git a/include/Nazara/Core/Flags.inl b/include/Nazara/Core/Flags.inl
index f74ae2169..2b57a59a8 100644
--- a/include/Nazara/Core/Flags.inl
+++ b/include/Nazara/Core/Flags.inl
@@ -166,7 +166,7 @@ namespace Nz
 	* This will enable flags which are enabled in parameter object and not in Flag object.
 	*/
 	template<typename E>
-	constexpr Flags<E>& Flags<E>::operator|=(const Flags& rhs)
+	/*constexpr*/ Flags<E>& Flags<E>::operator|=(const Flags& rhs)
 	{
 		m_value |= rhs.m_value;
 
@@ -182,7 +182,7 @@ namespace Nz
 	* This will disable flags which are disabled in parameter object and enabled in Flag object (and vice-versa).
 	*/
 	template<typename E>
-	constexpr Flags<E>& Flags<E>::operator&=(const Flags& rhs)
+	/*constexpr*/ Flags<E>& Flags<E>::operator&=(const Flags& rhs)
 	{
 		m_value &= rhs.m_value;
 
@@ -199,7 +199,7 @@ namespace Nz
 	* This will disable flags enabled in both Flags objects and enable those enabled in only one of the Flags objects.
 	*/
 	template<typename E>
-	constexpr Flags<E>& Flags<E>::operator^=(const Flags& rhs)
+	/*constexpr*/ Flags<E>& Flags<E>::operator^=(const Flags& rhs)
 	{
 		m_value ^= rhs.m_value;
 		m_value &= ValueMask;