Changeset 379 for trunk/nv/interface/map_area.hh

Timestamp:

05/29/15 17:23:04 (10 years ago)

Author:

epyon

Message:

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

File:

• trunk/nv/interface/map_area.hh (modified) (3 diffs)

trunk/nv/interface/map_area.hh

@@ -17 +17 @@
 #include <nv/stl/string.hh>
 #include <nv/stl/array.hh>
+#include <string>
 
 namespace nv
@@ -27 +28 @@
                 virtual uint32 get_cell( const position& p ) const = 0;
                 virtual void set_cell( const position& p, uint32 value ) = 0;
-                virtual uint32 string_to_id( const nv::string& ) const { return 0; }
-                virtual nv::string id_to_string( uint32 ) const { return nv::string(); }
+                virtual uint32 string_to_id( const std::string& ) const { return 0; }
+                virtual std::string id_to_string( uint32 ) const { return std::string(); }
                 virtual dimension get_size() const = 0;
                 virtual position get_shift() const { return position(); }
@@ -48 +49 @@
                 virtual dimension get_size() const { return m_area.get_size(); }
                 virtual position get_shift() const { return m_area.ul + m_map_area->get_shift(); }
-                virtual uint32 string_to_id( const nv::string& s ) const { return m_map_area->string_to_id( s ); }
-                virtual nv::string id_to_string( uint32 id ) const { return m_map_area->id_to_string( id ); }
+                virtual uint32 string_to_id( const std::string& s ) const { return m_map_area->string_to_id( s ); }
+                virtual std::string id_to_string( uint32 id ) const { return m_map_area->id_to_string( id ); }
         private:
                 map_area* m_map_area;