Changeset 394 for trunk/nv/engine/resource_system.hh

Timestamp:

06/11/15 20:01:25 (10 years ago)

Author:

epyon

Message:

• further removal of platform STL

File:

• trunk/nv/engine/resource_system.hh (modified) (4 diffs)

trunk/nv/engine/resource_system.hh

@@ -17 +17 @@
 #include <nv/interface/context.hh>
 #include <nv/lua/lua_state.hh>
-#include <unordered_map>
+#include <nv/stl/unordered_map.hh>
+#include <nv/stl/vector.hh>
 
 namespace nv
@@ -42 +43 @@
 
                 lua::state* m_lua;
-                std::unordered_map< std::string, resource_id > m_names;
+                unordered_map< std::string, resource_id > m_names;
         };
 
@@ -84 +85 @@
                 }
 
-                std::vector< T > m_data;
+                vector< T > m_data;
         };
 
@@ -97 +98 @@
                 virtual ~resource_system();
         protected:
-                std::vector< resource_manager_base* >     m_managers;
-                std::unordered_map< std::string, resource_id > m_manager_names;
+                vector< resource_manager_base* >     m_managers;
+                unordered_map< std::string, resource_id > m_manager_names;
                 lua::state* m_lua_state; 
         };