Changeset 374 for trunk/src/lua/lua_map_tile.cc

Timestamp:

05/26/15 17:35:06 (10 years ago)

Author:

epyon

Message:

• MASSIVE commit
• common.hh - size_t, ptrdiff_t, nv:: namespace, NV_ALIGN_OF and basic template tools
• STL - algorithm.hh, iterator.hh, limits.hh, numeric.hh and type_info.hh
• STL - updates to memory, array and string

File:

• trunk/src/lua/lua_map_tile.cc (modified) (3 diffs)

trunk/src/lua/lua_map_tile.cc

@@ -7 +7 @@
 #include "nv/lua/lua_map_tile.hh"
 
-#include <numeric>
 #include "nv/lua/lua_map_area.hh"
 #include "nv/stl/flags.hh"
+#include "nv/stl/numeric.hh"
+#include "nv/stl/algorithm.hh"
 #include "nv/core/random.hh"
 #include "nv/lua/lua_area.hh"
@@ -59 +60 @@
         map_tile tile;
 
-        tile.size_y = (nv::uint16)( std::count( code.begin(), code.end(), '\n' ) + 1 );
+        tile.size_y = (nv::uint16)( nv::count( code.begin(), code.end(), '\n' ) + 1 );
         tile.size_x = (nv::uint16)( code.find( '\n' ) );
         if ( tile.size_x == 0 )
@@ -236 +237 @@
         nv::uint16 org_x = tile->size_x;
         nv::uint16 org_y = tile->size_y;
-        nv::uint16 new_x = (nv::uint16)std::accumulate( sizes_x.begin(), sizes_x.end(), 0 );
-        nv::uint16 new_y = (nv::uint16)std::accumulate( sizes_y.begin(), sizes_y.end(), 0 );
+        nv::uint16 new_x = ( nv::uint16 )nv::accumulate( sizes_x.begin(), sizes_x.end(), 0 );
+        nv::uint16 new_y = ( nv::uint16 )nv::accumulate( sizes_y.begin(), sizes_y.end(), 0 );
 
         nv::uint8* data = new nv::uint8[ new_x * new_y ];