Changeset 376 for trunk/src/gui

Timestamp:

05/28/15 10:21:10 (10 years ago)

Author:

epyon

Message:

• stl/assert.hh, stl/capi.hh, size_t independent
• GCC 4.8 compatibility
• using template usage
• various minor changes

File:

• trunk/src/gui/gui_gfx_renderer.cc (modified) (5 diffs)

trunk/src/gui/gui_gfx_renderer.cc

@@ -107 +107 @@
 {
 public:
-        screen_render_data( context* actx, size_t initial_size )
+        screen_render_data( context* actx, nv::size_t initial_size )
                 : buffer( actx, VERTEX_BUFFER, DYNAMIC_DRAW, initial_size ), ctx( actx ), varray(), shader()
         {
@@ -175 +175 @@
 }
 
-texture_font* gfx_renderer::get_font( size_t name ) const
+texture_font* gfx_renderer::get_font( nv::size_t name ) const
 {
         if ( name >= m_fonts.size() ) return nullptr;
@@ -181 +181 @@
 }
 
-const image_info* gfx_renderer::get_image( size_t name ) const
+const image_info* gfx_renderer::get_image( nv::size_t name ) const
 {
         if ( name >= m_images.size() ) return nullptr;
@@ -187 +187 @@
 }
 
-size_t gfx_renderer::load_font( const std::string& filename, size_t size )
+nv::size_t gfx_renderer::load_font( const std::string& filename, nv::size_t size )
 {
         std::string id_name( filename );
@@ -205 +205 @@
 }
 
-size_t gfx_renderer::load_image( const std::string& filename )
+nv::size_t gfx_renderer::load_image( const std::string& filename )
 {
         auto i = m_image_names.find( filename );