mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r10646) -Cleanup: AutoPtrT<>::Release() renamed to Detach() 

-better describes what it does
 -was inconsistent with CCountedPtr<>::Release()
release/0.6
KUDr 2007-07-21 13:45:15 +00:00
parent af39f3a084
commit 43ddd64817
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/misc/autoptr.hpp
View File

@ -45,7 +45,7 @@ public:
} }
/** give-up ownership and NULLify the raw pointer */ /** give-up ownership and NULLify the raw pointer */
FORCEINLINE T* Release() FORCEINLINE T* Detach()
{ {
T* p = m_p; T* p = m_p;
m_p = NULL; m_p = NULL;

12
src/station_cmd.cpp
View File

@ -982,7 +982,7 @@ CommandCost CmdBuildRailroadStation(TileIndex tile_org, uint32 flags, uint32 p1,
RebuildStationLists(); RebuildStationLists();
InvalidateWindow(WC_STATION_LIST, st->owner); InvalidateWindow(WC_STATION_LIST, st->owner);
/* success, so don't delete the new station */ /* success, so don't delete the new station */
st_auto_delete.Release(); st_auto_delete.Detach();
} }
return cost; return cost;
@ -1361,8 +1361,8 @@ CommandCost CmdBuildRoadStop(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
RebuildStationLists(); RebuildStationLists();
InvalidateWindow(WC_STATION_LIST, st->owner); InvalidateWindow(WC_STATION_LIST, st->owner);
/* success, so don't delete the new station and the new road stop */ /* success, so don't delete the new station and the new road stop */
st_auto_delete.Release(); st_auto_delete.Detach();
rs_auto_delete.Release(); rs_auto_delete.Detach();
} }
return cost; return cost;
} }
@ -1668,7 +1668,7 @@ CommandCost CmdBuildAirport(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
RebuildStationLists(); RebuildStationLists();
InvalidateWindow(WC_STATION_LIST, st->owner); InvalidateWindow(WC_STATION_LIST, st->owner);
/* success, so don't delete the new station */ /* success, so don't delete the new station */
st_auto_delete.Release(); st_auto_delete.Detach();
} }
return cost; return cost;
@ -1764,7 +1764,7 @@ CommandCost CmdBuildBuoy(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
RebuildStationLists(); RebuildStationLists();
InvalidateWindow(WC_STATION_LIST, st->owner); InvalidateWindow(WC_STATION_LIST, st->owner);
/* success, so don't delete the new station */ /* success, so don't delete the new station */
st_auto_delete.Release(); st_auto_delete.Detach();
} }
return CommandCost(_price.build_dock); return CommandCost(_price.build_dock);
@ -1931,7 +1931,7 @@ CommandCost CmdBuildDock(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
RebuildStationLists(); RebuildStationLists();
InvalidateWindow(WC_STATION_LIST, st->owner); InvalidateWindow(WC_STATION_LIST, st->owner);
/* success, so don't delete the new station */ /* success, so don't delete the new station */
st_auto_delete.Release(); st_auto_delete.Detach();
} }
return CommandCost(_price.build_dock); return CommandCost(_price.build_dock);
} }