From aa49034e50d81eb93575e8e4870a25370f19fe77 Mon Sep 17 00:00:00 2001 From: Olga Khlopkova Date: Fri, 1 May 2020 13:40:52 +0300 Subject: [PATCH] Removed constness of 'res' which prevented automatic move --- include/just_gtfs/just_gtfs.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/include/just_gtfs/just_gtfs.h b/include/just_gtfs/just_gtfs.h index cd8e5c6..627c020 100644 --- a/include/just_gtfs/just_gtfs.h +++ b/include/just_gtfs/just_gtfs.h @@ -1040,49 +1040,49 @@ inline Feed::Feed(const std::string & gtfs_path) : gtfs_directory(gtfs_path) { inline Result Feed::read_feed() { - // Read required files - if (auto const res = read_agencies(); res.code != ResultCode::OK) + // Read required files: + if (auto res = read_agencies(); res.code != ResultCode::OK) return res; - if (auto const res = read_stops(); res.code != ResultCode::OK) + if (auto res = read_stops(); res.code != ResultCode::OK) return res; - if (auto const res = read_routes(); res.code != ResultCode::OK) + if (auto res = read_routes(); res.code != ResultCode::OK) return res; - if (auto const res = read_trips(); res.code != ResultCode::OK) + if (auto res = read_trips(); res.code != ResultCode::OK) return res; - if (auto const res = read_stop_times(); res.code != ResultCode::OK) + if (auto res = read_stop_times(); res.code != ResultCode::OK) return res; - // Conditionally required: - if (auto const res = read_calendar(); res.code != ResultCode::OK) + // Read conditionally required files: + if (auto res = read_calendar(); res.code != ResultCode::OK) { if (res != ResultCode::ERROR_FILE_ABSENT) return res; } - if (auto const res = read_calendar_dates(); res.code != ResultCode::OK) + if (auto res = read_calendar_dates(); res.code != ResultCode::OK) { if (res != ResultCode::ERROR_FILE_ABSENT) return res; } // Optional files: - if (auto const res = read_shapes(); res.code != ResultCode::OK) + if (auto res = read_shapes(); res.code != ResultCode::OK) { if (res != ResultCode::ERROR_FILE_ABSENT) return res; } - if (auto const res = read_transfers(); res.code != ResultCode::OK) + if (auto res = read_transfers(); res.code != ResultCode::OK) { if (res != ResultCode::ERROR_FILE_ABSENT) return res; } - if (auto const res = read_frequencies(); res.code != ResultCode::OK) + if (auto res = read_frequencies(); res.code != ResultCode::OK) { if (res != ResultCode::ERROR_FILE_ABSENT) return res;