Index: trunk/src/formats/md2_loader.cc
===================================================================
--- trunk/src/formats/md2_loader.cc	(revision 368)
+++ trunk/src/formats/md2_loader.cc	(revision 374)
@@ -238,5 +238,5 @@
 }
 
-size_t md2_loader::get_max_frames() const
+nv::size_t md2_loader::get_max_frames() const
 {
 	return static_cast< size_t >( ((md2_t*)m_md2)->header.num_frames );
Index: trunk/src/formats/md3_loader.cc
===================================================================
--- trunk/src/formats/md3_loader.cc	(revision 368)
+++ trunk/src/formats/md3_loader.cc	(revision 374)
@@ -172,5 +172,5 @@
 	source.read( surface->vertices, sizeof( md3_vertex_t ), static_cast<size_t>( surface->header.num_verts * surface->header.num_frames ) );
 
-	if ( source.tell() != static_cast<std::size_t>( pos + surface->header.ofs_end ) ) return false;
+	if ( source.tell() != static_cast<size_t>( pos + surface->header.ofs_end ) ) return false;
 
 	return true;
Index: trunk/src/formats/md5_loader.cc
===================================================================
--- trunk/src/formats/md5_loader.cc	(revision 368)
+++ trunk/src/formats/md5_loader.cc	(revision 374)
@@ -344,5 +344,6 @@
 		vtc.tangent  = glm::vec3(0);
 
-		std::sort( weights + start_weight, weights + start_weight + weight_count, [](const md5_weight& a, const md5_weight& b) -> bool { return a.bias > b.bias; } );
+		stable_sort( weights + start_weight, weights + start_weight + weight_count, [] ( const md5_weight& a, const md5_weight& b ) -> bool { return a.bias > b.bias; } );
+		//std::sort( weights + start_weight, weights + start_weight + weight_count, [](const md5_weight& a, const md5_weight& b) -> bool { return a.bias > b.bias; } );
 
 		if ( weight_count > 4 )
Index: trunk/src/formats/obj_loader.cc
===================================================================
--- trunk/src/formats/obj_loader.cc	(revision 368)
+++ trunk/src/formats/obj_loader.cc	(revision 374)
@@ -53,6 +53,6 @@
 	std::string next_name;
 
-	std::size_t size;
-	bool        eof;
+	size_t size;
+	bool   eof;
 
 	obj_reader();
@@ -172,5 +172,5 @@
 {
 	mesh_data_reader( bool normals ) : m_normals( normals ) {}
-	virtual std::size_t add_face( uint32* vi, uint32* ti, uint32* ni, size_t count )
+	virtual size_t add_face( uint32* vi, uint32* ti, uint32* ni, size_t count )
 	{
 		if ( count < 3 ) return 0; // TODO : report error?
@@ -178,5 +178,5 @@
 		// TODO : support if normals not present;
 		vec3 nullvec;
-		std::size_t result = 0;
+		size_t result = 0;
 		// Simple triangulation - obj's shouldn't have more than quads anyway
 
@@ -278,5 +278,5 @@
 		}
 
-		for (std::size_t a = 0; a < count; ++a )
+		for (size_t a = 0; a < count; ++a )
 		{
 			const vec3& n = m_data[a].normal;