Use final specifier instead of make_final, update type_traits.

Author: nitrocaster

src/common/object_loader.h

@@ -7,6 +7,7 @@
 ////////////////////////////////////////////////////////////////////////////
 
 #pragma once
+#include <type_traits>
 
 template <class M, typename P>
 struct CLoader {
@@ -16,7 +17,7 @@ struct CLoader {
 		template <bool a>
 		IC	static void load_data(T &data, M &stream, const P &p)
 		{
-			STATIC_CHECK				(!is_polymorphic<T>::result,Cannot_load_polymorphic_classes_as_binary_data);
+			STATIC_CHECK				(!std::is_polymorphic<T>::value,Cannot_load_polymorphic_classes_as_binary_data);
 			stream.r					(&data,sizeof(T));
 		}
 

src/common/object_saver.h

@@ -7,6 +7,7 @@
 ////////////////////////////////////////////////////////////////////////////
 
 #pragma once
+#include <type_traits>
 
 template <class M, typename P>
 struct CSaver {
@@ -16,7 +17,7 @@ struct CSaver {
 		template <bool a>
 		IC	static void save_data(const T &data, M &stream, const P &p)
 		{
-			STATIC_CHECK				(!is_polymorphic<T>::result,Cannot_save_polymorphic_classes_as_binary_data);
+			STATIC_CHECK				(!std::is_polymorphic<T>::value,Cannot_save_polymorphic_classes_as_binary_data);
 			stream.w					(&data,sizeof(T));
 		}
 

src/common/object_type_traits.h

@@ -154,8 +154,8 @@
 
 			enum { 
 				value = 
-					is_class<T1>::result && 
-					is_class<T2>::result && 
+					std::is_class<T1>::value && 
+					std::is_class<T2>::value && 
 					!is_same<T1,T2>::value &&
 					sizeof(detail::yes) == sizeof(select((T2*)(0)))
 			};

src/xrCDB/StdAfx.h

@@ -54,7 +54,7 @@ IC	void cdelete		(T* &ptr)
 {
 	if (ptr) 
 	{
-		cspecial_free<is_polymorphic<T>::result,T>()(ptr);
+		cspecial_free<std::is_polymorphic<T>::value,T>()(ptr);
 		ptr = NULL;
 	}
 }

src/xrCore/_stl_extensions.h

@@ -3,8 +3,6 @@
 
 using std::swap;
 
-#include "_type_traits.h"
-
 #ifdef __BORLANDC__
 #define M_NOSTDCONTAINERS_EXT
 #endif

src/xrCore/_type_traits.h

@@ -533,7 +533,6 @@
     <ClInclude Include="_std_extensions.h" />
     <ClInclude Include="_stl_extensions.h" />
     <ClInclude Include="_types.h" />
-    <ClInclude Include="_type_traits.h" />
     <ClInclude Include="_vector2.h" />
     <ClInclude Include="_vector3d.h" />
     <ClInclude Include="_vector3d_ext.h" />

src/xrCore/xrCore.vcxproj

@@ -479,9 +479,6 @@
     <ClInclude Include="_stl_extensions.h">
       <Filter>Math\Extensions</Filter>
     </ClInclude>
-    <ClInclude Include="_type_traits.h">
-      <Filter>Math\Extensions</Filter>
-    </ClInclude>
     <ClInclude Include="clsid.h">
       <Filter>Math\Extensions</Filter>
     </ClInclude>

src/xrCore/xrCore.vcxproj.filters

@@ -168,7 +168,7 @@ IC void xr_delete(T*& ptr)
 {
     if (ptr)
     {
-        xr_special_free<is_polymorphic<T>::result, T>()(ptr);
+        xr_special_free<std::is_polymorphic<T>::value, T>()(ptr);
         ptr = NULL;
     }
 }
@@ -177,7 +177,7 @@ IC void xr_delete(T* const& ptr)
 {
     if (ptr)
     {
-        xr_special_free<is_polymorphic<T>::result, T>(ptr);
+        xr_special_free<std::is_polymorphic<T>::value, T>(ptr);
         const_cast<T*&>(ptr) = NULL;
     }
 }

src/xrCore/xrMemory_subst_msvc.h

@@ -163,11 +163,9 @@ namespace smart_cover {
 void CCoverManager::remove_nearby_covers	(smart_cover::cover const &cover, smart_cover::object const &object) const
 {
 	m_nearest.clear			();
-	typedef smart_cover::description::Loopholes::const_iterator const_iterator;
-	const_iterator			I = cover.loopholes().begin();
-	const_iterator			E = cover.loopholes().end();
-	for ( ; I != E; ++I ) {
-		Fvector				position = cover.fov_position(**I);
+	for (const smart_cover::loophole *loophole : cover.loopholes())
+    {
+		Fvector				position = cover.fov_position(*loophole);
 		m_covers->nearest	(position, object.Radius() + 1.f, m_nearest);
 
 		m_nearest.erase(