(svn r23770) -Fix: compilation with GCC 4.7

This commit is contained in:
smatz 2012-01-07 18:37:22 +00:00
parent 182969f531
commit 24bf6ea495
2 changed files with 7 additions and 7 deletions

View File

@ -44,11 +44,11 @@ public:
*/ */
enum StationType { enum StationType {
/* Note: these values represent part of the in-game StationFacility enum */ /* Note: these values represent part of the in-game StationFacility enum */
STATION_TRAIN = ::FACIL_TRAIN, ///< Train station STATION_TRAIN = (int)::FACIL_TRAIN, ///< Train station
STATION_TRUCK_STOP = ::FACIL_TRUCK_STOP, ///< Truck station STATION_TRUCK_STOP = (int)::FACIL_TRUCK_STOP, ///< Truck station
STATION_BUS_STOP = ::FACIL_BUS_STOP, ///< Bus station STATION_BUS_STOP = (int)::FACIL_BUS_STOP, ///< Bus station
STATION_AIRPORT = ::FACIL_AIRPORT, ///< Airport STATION_AIRPORT = (int)::FACIL_AIRPORT, ///< Airport
STATION_DOCK = ::FACIL_DOCK, ///< Dock STATION_DOCK = (int)::FACIL_DOCK, ///< Dock
STATION_ANY = STATION_TRAIN | STATION_TRUCK_STOP | STATION_BUS_STOP | STATION_AIRPORT | STATION_DOCK, ///< All station types STATION_ANY = STATION_TRAIN | STATION_TRUCK_STOP | STATION_BUS_STOP | STATION_AIRPORT | STATION_DOCK, ///< All station types
}; };

View File

@ -41,8 +41,8 @@ public:
*/ */
enum WaypointType { enum WaypointType {
/* Note: these values represent part of the in-game StationFacility enum */ /* Note: these values represent part of the in-game StationFacility enum */
WAYPOINT_RAIL = ::FACIL_TRAIN, ///< Rail waypoint WAYPOINT_RAIL = (int)::FACIL_TRAIN, ///< Rail waypoint
WAYPOINT_BUOY = ::FACIL_DOCK, ///< Buoy WAYPOINT_BUOY = (int)::FACIL_DOCK, ///< Buoy
WAYPOINT_ANY = WAYPOINT_RAIL | WAYPOINT_BUOY, ///< All waypoint types WAYPOINT_ANY = WAYPOINT_RAIL | WAYPOINT_BUOY, ///< All waypoint types
}; };