From 24bf6ea4955dad7c2dd65214fc500b08d2b9cbee Mon Sep 17 00:00:00 2001 From: smatz Date: Sat, 7 Jan 2012 18:37:22 +0000 Subject: [PATCH] (svn r23770) -Fix: compilation with GCC 4.7 --- src/script/api/script_station.hpp | 10 +++++----- src/script/api/script_waypoint.hpp | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/script/api/script_station.hpp b/src/script/api/script_station.hpp index b6da4a913c..268a0bce4f 100644 --- a/src/script/api/script_station.hpp +++ b/src/script/api/script_station.hpp @@ -44,11 +44,11 @@ public: */ enum StationType { /* Note: these values represent part of the in-game StationFacility enum */ - STATION_TRAIN = ::FACIL_TRAIN, ///< Train station - STATION_TRUCK_STOP = ::FACIL_TRUCK_STOP, ///< Truck station - STATION_BUS_STOP = ::FACIL_BUS_STOP, ///< Bus station - STATION_AIRPORT = ::FACIL_AIRPORT, ///< Airport - STATION_DOCK = ::FACIL_DOCK, ///< Dock + STATION_TRAIN = (int)::FACIL_TRAIN, ///< Train station + STATION_TRUCK_STOP = (int)::FACIL_TRUCK_STOP, ///< Truck station + STATION_BUS_STOP = (int)::FACIL_BUS_STOP, ///< Bus station + STATION_AIRPORT = (int)::FACIL_AIRPORT, ///< Airport + STATION_DOCK = (int)::FACIL_DOCK, ///< Dock STATION_ANY = STATION_TRAIN | STATION_TRUCK_STOP | STATION_BUS_STOP | STATION_AIRPORT | STATION_DOCK, ///< All station types }; diff --git a/src/script/api/script_waypoint.hpp b/src/script/api/script_waypoint.hpp index afbc435f6c..7a8b4c97b3 100644 --- a/src/script/api/script_waypoint.hpp +++ b/src/script/api/script_waypoint.hpp @@ -41,8 +41,8 @@ public: */ enum WaypointType { /* Note: these values represent part of the in-game StationFacility enum */ - WAYPOINT_RAIL = ::FACIL_TRAIN, ///< Rail waypoint - WAYPOINT_BUOY = ::FACIL_DOCK, ///< Buoy + WAYPOINT_RAIL = (int)::FACIL_TRAIN, ///< Rail waypoint + WAYPOINT_BUOY = (int)::FACIL_DOCK, ///< Buoy WAYPOINT_ANY = WAYPOINT_RAIL | WAYPOINT_BUOY, ///< All waypoint types };