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

(svn r26563) -Fix (r26558): Don't pass explicit template arguments to std::make_pair.

release/1.5
fonsinchen 2014-05-04 19:03:54 +00:00
parent b0ef051b5e
commit 5fc2c3dcc8
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/script/api/script_station.cpp
View File

@ -54,8 +54,7 @@ template<bool Tfrom, bool Tvia>
uint16 cargo_count = 0; uint16 cargo_count = 0;
std::pair<StationCargoList::ConstIterator, StationCargoList::ConstIterator> range = Tvia ? std::pair<StationCargoList::ConstIterator, StationCargoList::ConstIterator> range = Tvia ?
cargo_list.Packets()->equal_range(via_station_id) : cargo_list.Packets()->equal_range(via_station_id) :
std::make_pair<StationCargoList::ConstIterator, StationCargoList::ConstIterator>( std::make_pair(StationCargoList::ConstIterator(cargo_list.Packets()->begin()),
StationCargoList::ConstIterator(cargo_list.Packets()->begin()),
StationCargoList::ConstIterator(cargo_list.Packets()->end())); StationCargoList::ConstIterator(cargo_list.Packets()->end()));
for (StationCargoList::ConstIterator it = range.first; it != range.second; it++) { for (StationCargoList::ConstIterator it = range.first; it != range.second; it++) {
const CargoPacket *cp = *it; const CargoPacket *cp = *it;