diff options
author | Khlopkova Olga <o.khlopkova@corp.mail.ru> | 2021-02-01 14:37:20 +0300 |
---|---|---|
committer | Khlopkova Olga <o.khlopkova@corp.mail.ru> | 2021-02-01 14:37:20 +0300 |
commit | a74b71af50fd8571ee40fbf559dcfe7ffd096a5f (patch) | |
tree | 6a12c791b2d5cf3c907c55a1d00f37d262327dcf | |
parent | 5a6590533cd82dacc5338d8bcb8ecc8fb8ca251c (diff) |
clang-formatfix-fare-attributes
-rw-r--r-- | include/just_gtfs/just_gtfs.h | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/include/just_gtfs/just_gtfs.h b/include/just_gtfs/just_gtfs.h index def363f..349d472 100644 --- a/include/just_gtfs/just_gtfs.h +++ b/include/just_gtfs/just_gtfs.h @@ -999,13 +999,12 @@ struct FareAttributesItem size_t transfer_duration = 0; // Length of time in seconds before a transfer expires }; - inline bool operator==(const FareAttributesItem & lhs, const FareAttributesItem & rhs) { - return std::tie(lhs.fare_id, lhs.price, lhs.currency_type, lhs.payment_method, - lhs.transfers, lhs.agency_id, lhs.transfer_duration) == - std::tie(rhs.fare_id, rhs.price, rhs.currency_type, rhs.payment_method, - rhs.transfers, rhs.agency_id, rhs.transfer_duration); + return std::tie(lhs.fare_id, lhs.price, lhs.currency_type, lhs.payment_method, lhs.transfers, + lhs.agency_id, lhs.transfer_duration) == + std::tie(rhs.fare_id, rhs.price, rhs.currency_type, rhs.payment_method, rhs.transfers, + rhs.agency_id, rhs.transfer_duration); } // Optional dataset file @@ -2787,13 +2786,12 @@ inline void Feed::write_fare_attributes(std::ofstream & out) const for (const auto & attribute : fare_attributes) { std::vector<std::string> fields{ - wrap(attribute.fare_id), wrap(attribute.price), attribute.currency_type, + wrap(attribute.fare_id), wrap(attribute.price), attribute.currency_type, wrap(attribute.payment_method), // Here we handle GTFS specification corner case: "The fact that this field can be left // empty is an exception to the requirement that a Required field must not be empty.": - attribute.transfers == FareTransfers::Unlimited? "" : wrap(attribute.transfers), - wrap(attribute.agency_id), - wrap(attribute.transfer_duration)}; + attribute.transfers == FareTransfers::Unlimited ? "" : wrap(attribute.transfers), + wrap(attribute.agency_id), wrap(attribute.transfer_duration)}; write_joined(out, std::move(fields)); } } |