Changeset 394 for trunk

Timestamp:

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

Author:

epyon

Message:

• further removal of platform STL

Location:

trunk/nv

Files:

• engine/resource_system.hh (modified) (4 diffs)
• gfx/texture_atlas.hh (modified) (1 diff)
• gfx/texture_font.hh (modified) (3 diffs)
• gui/gui_gfx_renderer.hh (modified) (1 diff)
• interface/font.hh (modified) (3 diffs)
• stl/cstring_store.hh (modified) (3 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; 
         };

trunk/nv/gfx/texture_atlas.hh

@@ -13 +13 @@
 #include <nv/stl/math.hh>
 #include <nv/gfx/image.hh>
+//#include <nv/stl/vector.hh>
 #include <vector>
 

trunk/nv/gfx/texture_font.hh

@@ -10 +10 @@
 #include <nv/core/common.hh>
 #include <nv/stl/string.hh>
-#include <unordered_map>
+#include <nv/stl/unordered_map.hh>
 #include <nv/stl/math.hh>
 #include <nv/gfx/texture_atlas.hh>
@@ -24 +24 @@
                 vec2   tl;      //!< Top-left of the glyph's bounding box.
                 vec2   br;      //!< Bottom-right of the glyph's bounding box.
-                std::unordered_map< uint16, float > kerning; //!< Kerning space between other characters.
+                unordered_map< uint16, float > kerning; //!< Kerning space between other characters.
 
                 /**
@@ -51 +51 @@
                         void generate_kerning();
                 private:
-                        std::unordered_map< uint16, texture_glyph > m_glyphs; //!< Hash table of glyphs for this font.
+                        unordered_map< uint16, texture_glyph > m_glyphs; //!< Hash table of glyphs for this font.
 
                         texture_atlas* m_atlas; //!< Atlas Image object for this font.

trunk/nv/gui/gui_gfx_renderer.hh

@@ -59 +59 @@
                         size_t load_image( const std::string& filename );
 
-                        typedef std::unordered_map< std::string, size_t > names;
-                        typedef std::vector< texture_font* >              font_vector;
-                        typedef std::vector< image_info >                 image_vector;
+                        typedef unordered_map< std::string, size_t > names;
+                        typedef vector< texture_font* >              font_vector;
+                        typedef vector< image_info >                 image_vector;
 
                         context*      m_context;

trunk/nv/interface/font.hh

@@ -9 +9 @@
 
 #include <nv/core/common.hh>
-#include <nv/core/math.hh>
-#include <unordered_map>
+#include <nv/stl/math.hh>
+#include <nv/stl/unordered_map.hh>
 
 namespace nv
@@ -22 +22 @@
             vec2 tl;
             vec2 br;
-                std::unordered_map< uint16, float > kerning;
+                unordered_map< uint16, float > kerning;
 
                 gylph();
@@ -33 +33 @@
                 const gylph* get_gylph( uint16 charcode ) const;
         private:
-                std::unordered_map< uint16, gylph > m_gylphs;
-        }
+                unordered_map< uint16, gylph > m_gylphs;
+        };
 
 

trunk/nv/stl/cstring_store.hh

@@ -68 +68 @@
                 bool exists( const char* cstr )
                 {
-                        return m_map.find( cstr ) != std::end( m_map );
+                        return m_map.find( cstr ) != m_map.end();
                 }
                 
@@ -79 +79 @@
                 {
                         auto it = m_map.find( cstr );
-                        if ( it != std::end( m_map ) )
+                        if ( it != m_map.end() )
                         {
                                 return it->second;
@@ -98 +98 @@
                 {
                         auto it = m_map.find( cstr );
-                        if ( it == std::end( m_map ) )
+                        if ( it == m_map.end() )
                         {
                                 return push( cstr );