Changeset 380 for trunk/src/formats/assimp_loader.cc

Timestamp:

05/29/15 17:28:16 (10 years ago)

Author:

epyon

Message:

• oops, missed src : got rid of to_string and other std::string utilities (except slurp) string no longer in nv namespace

File:

• trunk/src/formats/assimp_loader.cc (modified) (2 diffs)

trunk/src/formats/assimp_loader.cc

@@ -57 +57 @@
 
 
-nv::assimp_loader::assimp_loader( const string& a_ext, uint32 a_assimp_flags /*= 0 */ ) 
+nv::assimp_loader::assimp_loader( const std::string& a_ext, uint32 a_assimp_flags /*= 0 */ )
         : m_scene( nullptr ), m_mesh_count(0)
 {
@@ -374 +374 @@
         const aiScene* scene = (const aiScene*)m_scene;
         const aiNode*  node  = (const aiNode*)vnode;
-        string name( node->mName.data );
+        std::string name( node->mName.data );
         const aiAnimation* anim  = scene->mAnimations[anim_id];
         const aiNodeAnim*  anode = nullptr;