Conflicts fixed

Utilities/BEType.h

@@ -50,10 +50,11 @@ class be_t
 
 public:
 	typedef T type;
+
 #ifdef _WIN32
 	be_t(){}
 #else
-	be_t()	noexcept = default
+	be_t()	noexcept = default;
 #endif
 
 	be_t(const T& value)

Utilities/SMutex.cpp

@@ -1,6 +1,7 @@
 #include <stdafx.h>
 #include <Utilities/SMutex.h>
 
+
 __forceinline void SM_Sleep()
 {
 	Sleep(1);
@@ -8,7 +9,7 @@ __forceinline void SM_Sleep()
 
 __forceinline size_t SM_GetCurrentThreadId()
 {
-	return std::this_thread::get_id().hash();
+	return std::hash<std::thread::id>()(std::this_thread::get_id());
 }
 
 __forceinline u32 SM_GetCurrentCPUThreadId()

Utilities/SQueue.h

@@ -15,7 +15,7 @@ public:
 	{
 	}
 
-	bool Push(T& data)
+	bool Push(const T& data)
 	{
 		while (true)
 		{
@@ -100,4 +100,4 @@ public:
 		SMutexLocker lock(m_mutex);
 		return m_data[(m_pos + pos) % SQSize];
 	}
-};
+};