(svn r16380) -Codechange: rename pool.hpp to pool_type.hpp

projects/openttd_vs80.vcproj

@@ -1676,11 +1676,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\core\pool.hpp"
+				RelativePath=".\..\src\core\pool_func.hpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\core\pool_func.hpp"
+				RelativePath=".\..\src\core\pool_type.hpp"
 				>
 			</File>
 			<File

projects/openttd_vs90.vcproj

@@ -1673,11 +1673,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\core\pool.hpp"
+				RelativePath=".\..\src\core\pool_func.hpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\core\pool_func.hpp"
+				RelativePath=".\..\src\core\pool_type.hpp"
 				>
 			</File>
 			<File

source.list

@@ -364,8 +364,8 @@ core/math_func.cpp
 core/math_func.hpp
 core/mem_func.hpp
 core/overflowsafe_type.hpp
-core/pool.hpp
 core/pool_func.hpp
+core/pool_type.hpp
 core/random_func.cpp
 core/random_func.hpp
 core/smallmap_type.hpp

src/autoreplace_base.h

@@ -5,7 +5,7 @@
 #ifndef AUTOREPLACE_BASE_H
 #define AUTOREPLACE_BASE_H
 
-#include "core/pool.hpp"
+#include "core/pool_type.hpp"
 #include "autoreplace_type.h"
 
 typedef uint16 EngineRenewID;

src/cargopacket.h

@@ -5,7 +5,7 @@
 #ifndef CARGOPACKET_H
 #define CARGOPACKET_H
 
-#include "core/pool.hpp"
+#include "core/pool_type.hpp"
 #include "economy_type.h"
 #include "tile_type.h"
 #include "station_type.h"

src/company_base.h

@@ -6,7 +6,7 @@
 #define COMPANY_BASE_H
 
 #include "company_type.h"
-#include "core/pool.hpp"
+#include "core/pool_type.hpp"
 #include "road_type.h"
 #include "rail_type.h"
 #include "date_type.h"

src/core/pool_func.hpp

@@ -7,7 +7,7 @@
 
 #include "alloc_func.hpp"
 #include "mem_func.hpp"
-#include "pool.hpp"
+#include "pool_type.hpp"
 
 #define DEFINE_POOL_METHOD(type) \
 	template <class Titem, typename Tindex, size_t Tgrowth_step, size_t Tmax_size> \

src/core/pool_type.hpp

@@ -1,9 +1,9 @@
 /* $Id$ */
 
-/** @file pool.hpp Defintion of Pool, structure used to access PoolItems, and PoolItem, base structure for Vehicle, Town, and other indexed items. */
+/** @file pool_type.hpp Defintion of Pool, structure used to access PoolItems, and PoolItem, base structure for Vehicle, Town, and other indexed items. */
 
-#ifndef POOL_HPP
+#ifndef POOL_TYPE_HPP
-#define POOL_HPP
+#define POOL_TYPE_HPP
 
 template <class Titem, typename Tindex, size_t Tgrowth_step, size_t Tmax_size>
 struct Pool {
@@ -281,4 +281,4 @@ private:
 
 #define FOR_ALL_ITEMS(type, iter, var) FOR_ALL_ITEMS_FROM(type, iter, var, 0)
 
-#endif /* POOL_HPP */
+#endif /* POOL_TYPE_HPP */

src/depot_base.h

@@ -7,7 +7,7 @@
 
 #include "tile_type.h"
 #include "depot_type.h"
-#include "core/pool.hpp"
+#include "core/pool_type.hpp"
 #include "town_type.h"
 
 typedef Pool<Depot, DepotID, 64, 64000> DepotPool;

src/engine_base.h

@@ -7,7 +7,7 @@
 
 #include "engine_type.h"
 #include "economy_type.h"
-#include "core/pool.hpp"
+#include "core/pool_type.hpp"
 #include "core/smallvec_type.hpp"
 
 typedef Pool<Engine, EngineID, 64, 64000> EnginePool;

src/group.h

@@ -6,7 +6,7 @@
 #define GROUP_H
 
 #include "group_type.h"
-#include "core/pool.hpp"
+#include "core/pool_type.hpp"
 #include "company_type.h"
 #include "vehicle_type.h"
 #include "engine_type.h"

src/industry.h

@@ -5,7 +5,7 @@
 #ifndef INDUSTRY_H
 #define INDUSTRY_H
 
-#include "core/pool.hpp"
+#include "core/pool_type.hpp"
 #include "core/random_func.hpp"
 #include "newgrf_storage.h"
 #include "cargo_type.h"

src/network/core/tcp_game.h

@@ -12,7 +12,7 @@
 #include "os_abstraction.h"
 #include "tcp.h"
 #include "packet.h"
-#include "../../core/pool.hpp"
+#include "../../core/pool_type.hpp"
 
 /**
  * Enum with all types of UDP packets.

src/network/network_base.h

@@ -8,7 +8,7 @@
 #ifdef ENABLE_NETWORK
 
 #include "network_type.h"
-#include "../core/pool.hpp"
+#include "../core/pool_type.hpp"
 
 typedef Pool<NetworkClientInfo, ClientIndex, 8, MAX_CLIENT_SLOTS> NetworkClientInfoPool;
 extern NetworkClientInfoPool _networkclientinfo_pool;

src/newgrf_spritegroup.h

@@ -11,7 +11,7 @@
 #include "gfx_type.h"
 #include "engine_type.h"
 #include "tile_type.h"
-#include "core/pool.hpp"
+#include "core/pool_type.hpp"
 
 #include "newgrf_cargo.h"
 #include "newgrf_callbacks.h"

src/order_base.h

@@ -6,7 +6,7 @@
 #define ORDER_BASE_H
 
 #include "order_type.h"
-#include "core/pool.hpp"
+#include "core/pool_type.hpp"
 #include "core/bitmath_func.hpp"
 #include "cargo_type.h"
 #include "depot_type.h"

src/signs_base.h

@@ -8,7 +8,7 @@
 #include "signs_type.h"
 #include "viewport_type.h"
 #include "tile_type.h"
-#include "core/pool.hpp"
+#include "core/pool_type.hpp"
 
 typedef Pool<Sign, SignID, 16, 64000> SignPool;
 extern SignPool _sign_pool;

src/station_base.h

@@ -7,7 +7,7 @@
 
 #include "station_type.h"
 #include "airport.h"
-#include "core/pool.hpp"
+#include "core/pool_type.hpp"
 #include "cargopacket.h"
 #include "cargo_type.h"
 #include "town_type.h"

src/town.h

@@ -5,7 +5,7 @@
 #ifndef TOWN_H
 #define TOWN_H
 
-#include "core/pool.hpp"
+#include "core/pool_type.hpp"
 #include "core/bitmath_func.hpp"
 #include "core/random_func.hpp"
 #include "cargo_type.h"

src/vehicle_base.h

@@ -16,7 +16,7 @@
 #include "date_type.h"
 #include "company_base.h"
 #include "company_type.h"
-#include "core/pool.hpp"
+#include "core/pool_type.hpp"
 #include "order_base.h"
 #include "cargopacket.h"
 #include "texteff.hpp"

src/waypoint.h

@@ -12,7 +12,7 @@
 #include "town_type.h"
 #include "viewport_type.h"
 #include "date_type.h"
-#include "core/pool.hpp"
+#include "core/pool_type.hpp"
 
 typedef Pool<Waypoint, WaypointID, 32, 64000> WaypointPool;
 extern WaypointPool _waypoint_pool;