(svn r26328) -Fix: Warnings and compilation failures.

src/cargopacket.cpp

@@ -868,5 +868,4 @@ uint StationCargoList::Reroute(uint max_move, StationCargoList *dest, StationID
  */
 template class CargoList<VehicleCargoList, CargoPacketList>;
 template class CargoList<StationCargoList, StationCargoPacketMap>;
-template uint VehicleCargoList::Reassign<VehicleCargoList::MTA_DELIVER, VehicleCargoList::MTA_KEEP>(uint max_move, TileOrStationID);
-template uint VehicleCargoList::Reassign<VehicleCargoList::MTA_DELIVER, VehicleCargoList::MTA_TRANSFER>(uint max_move, TileOrStationID next_station);
+template uint VehicleCargoList::Reassign<VehicleCargoList::MTA_DELIVER, VehicleCargoList::MTA_KEEP>(uint, TileOrStationID);

src/industry_cmd.cpp

@@ -1566,7 +1566,7 @@ static CommandCost CheckIfFarEnoughFromConflictingIndustry(TileIndex tile, int t
 	const Industry *i = NULL;
 
 	/* On a large map with many industries, it may be faster to check an area. */
-	const int dmax = 14;
+	static const int dmax = 14;
 	if (Industry::GetNumItems() > (size_t) (dmax * dmax * 2)) {
 		const int tx = TileX(tile);
 		const int ty = TileY(tile);
@@ -1576,7 +1576,7 @@ static CommandCost CheckIfFarEnoughFromConflictingIndustry(TileIndex tile, int t
 				const Industry *i2 = Industry::GetByTile(atile);
 				if (i == i2) continue;
 				i = i2;
-				if (DistanceMax(tile, i->location.tile) > dmax) continue;
+				if (DistanceMax(tile, i->location.tile) > (uint)dmax) continue;
 				if (i->type == indspec->conflicting[0] ||
 						i->type == indspec->conflicting[1] ||
 						i->type == indspec->conflicting[2]) {