From 73dcb4bbb49fcf54bf67b387d1ae247ab98b87c4 Mon Sep 17 00:00:00 2001 From: Mario Konrad Date: Fri, 14 Oct 2016 23:38:05 +0200 Subject: [PATCH] Dev: consistent formatting with clang-format-3.9 --- bin/check-format | 4 +- examples/qtnmeadiag/MainWindow.cpp | 15 ++++-- examples/simple_seatalk_nmea_converter.cpp | 4 +- src/marnav/ais/angle.cpp | 10 +++- src/marnav/ais/message.cpp | 5 +- src/marnav/ais/message_05.cpp | 15 ++++-- src/marnav/ais/message_21.cpp | 10 +++- src/marnav/ais/message_24.cpp | 20 +++++-- src/marnav/geo/angle.cpp | 20 +++++-- src/marnav/geo/angle.hpp | 20 +++++-- src/marnav/geo/geodesic.cpp | 12 +++-- src/marnav/geo/region.cpp | 20 +++++-- src/marnav/io/default_nmea_reader.cpp | 4 +- src/marnav/io/nmea_reader.cpp | 4 +- src/marnav/io/seatalk_reader.cpp | 4 +- src/marnav/io/serial.cpp | 5 +- src/marnav/nmea/ais_helper.hpp | 4 +- src/marnav/nmea/angle.cpp | 10 +++- src/marnav/nmea/checksum.cpp | 5 +- src/marnav/nmea/date.cpp | 15 ++++-- src/marnav/nmea/manufacturer.cpp | 14 +++-- src/marnav/nmea/pgrme.cpp | 3 +- src/marnav/nmea/pgrmm.cpp | 8 +-- src/marnav/nmea/pgrmz.cpp | 3 +- src/marnav/nmea/string.cpp | 20 +++++-- src/marnav/nmea/time.cpp | 10 +++- src/marnav/nmea/tll.cpp | 10 +++- src/marnav/seatalk/message.cpp | 5 +- src/marnav/seatalk/message_26.cpp | 20 +++++-- src/marnav/seatalk/message_36.cpp | 5 +- src/marnav/seatalk/message_38.cpp | 5 +- src/marnav/seatalk/message_52.cpp | 10 +++- src/marnav/seatalk/message_53.cpp | 5 +- src/marnav/seatalk/message_65.cpp | 5 +- src/marnav/seatalk/message_66.cpp | 5 +- src/marnav/seatalk/message_89.cpp | 5 +- src/marnav/seatalk/seatalk.cpp | 5 +- src/marnav/utils/mmsi.cpp | 5 +- src/marnav/utils/mmsi.hpp | 5 +- src/marnav/utils/optional.hpp | 5 +- src/marnav/utils/unused.hpp | 4 +- src/nmeadump.cpp | 85 ++++++++++++++++++++++++------ test/geo/Test_geo_angle.cpp | 20 +++++-- test/nmea/Test_nmea.cpp | 15 ++++-- test/nmea/Test_nmea_aam.cpp | 10 +++- test/nmea/Test_nmea_alm.cpp | 10 +++- test/nmea/Test_nmea_apa.cpp | 10 +++- test/nmea/Test_nmea_apb.cpp | 10 +++- test/nmea/Test_nmea_bod.cpp | 10 +++- test/nmea/Test_nmea_bwc.cpp | 10 +++- test/nmea/Test_nmea_bwr.cpp | 10 +++- test/nmea/Test_nmea_bww.cpp | 10 +++- test/nmea/Test_nmea_dbk.cpp | 10 +++- test/nmea/Test_nmea_dbt.cpp | 10 +++- test/nmea/Test_nmea_dpt.cpp | 10 +++- test/nmea/Test_nmea_dsc.cpp | 10 +++- test/nmea/Test_nmea_dse.cpp | 10 +++- test/nmea/Test_nmea_dtm.cpp | 10 +++- test/nmea/Test_nmea_fsi.cpp | 10 +++- test/nmea/Test_nmea_gbs.cpp | 10 +++- test/nmea/Test_nmea_gga.cpp | 10 +++- test/nmea/Test_nmea_glc.cpp | 10 +++- test/nmea/Test_nmea_gll.cpp | 10 +++- test/nmea/Test_nmea_gns.cpp | 10 +++- test/nmea/Test_nmea_grs.cpp | 10 +++- test/nmea/Test_nmea_gsa.cpp | 10 +++- test/nmea/Test_nmea_gst.cpp | 10 +++- test/nmea/Test_nmea_gsv.cpp | 10 +++- test/nmea/Test_nmea_gtd.cpp | 10 +++- test/nmea/Test_nmea_hdg.cpp | 10 +++- test/nmea/Test_nmea_hdm.cpp | 10 +++- test/nmea/Test_nmea_hdt.cpp | 10 +++- test/nmea/Test_nmea_hfb.cpp | 10 +++- test/nmea/Test_nmea_hsc.cpp | 10 +++- test/nmea/Test_nmea_its.cpp | 10 +++- test/nmea/Test_nmea_lcd.cpp | 10 +++- test/nmea/Test_nmea_msk.cpp | 10 +++- test/nmea/Test_nmea_mss.cpp | 10 +++- test/nmea/Test_nmea_mtw.cpp | 10 +++- test/nmea/Test_nmea_mwd.cpp | 10 +++- test/nmea/Test_nmea_mwv.cpp | 10 +++- test/nmea/Test_nmea_osd.cpp | 10 +++- test/nmea/Test_nmea_pgrme.cpp | 10 +++- test/nmea/Test_nmea_pgrmm.cpp | 10 +++- test/nmea/Test_nmea_pgrmz.cpp | 10 +++- test/nmea/Test_nmea_r00.cpp | 10 +++- test/nmea/Test_nmea_rma.cpp | 10 +++- test/nmea/Test_nmea_rmb.cpp | 10 +++- test/nmea/Test_nmea_rmc.cpp | 10 +++- test/nmea/Test_nmea_rot.cpp | 10 +++- test/nmea/Test_nmea_rpm.cpp | 10 +++- test/nmea/Test_nmea_rsa.cpp | 10 +++- test/nmea/Test_nmea_rsd.cpp | 10 +++- test/nmea/Test_nmea_rte.cpp | 10 +++- test/nmea/Test_nmea_sfi.cpp | 10 +++- test/nmea/Test_nmea_tds.cpp | 10 +++- test/nmea/Test_nmea_tfi.cpp | 10 +++- test/nmea/Test_nmea_tll.cpp | 10 +++- test/nmea/Test_nmea_tpc.cpp | 10 +++- test/nmea/Test_nmea_tpr.cpp | 10 +++- test/nmea/Test_nmea_tpt.cpp | 10 +++- test/nmea/Test_nmea_ttm.cpp | 10 +++- test/nmea/Test_nmea_vbw.cpp | 10 +++- test/nmea/Test_nmea_vdm.cpp | 10 +++- test/nmea/Test_nmea_vdo.cpp | 10 +++- test/nmea/Test_nmea_vdr.cpp | 10 +++- test/nmea/Test_nmea_vhw.cpp | 10 +++- test/nmea/Test_nmea_vlw.cpp | 10 +++- test/nmea/Test_nmea_vpw.cpp | 10 +++- test/nmea/Test_nmea_vtg.cpp | 10 +++- test/nmea/Test_nmea_vwr.cpp | 10 +++- test/nmea/Test_nmea_wcv.cpp | 10 +++- test/nmea/Test_nmea_wnc.cpp | 10 +++- test/nmea/Test_nmea_wpl.cpp | 10 +++- test/nmea/Test_nmea_xdr.cpp | 10 +++- test/nmea/Test_nmea_xte.cpp | 10 +++- test/nmea/Test_nmea_xtr.cpp | 10 +++- test/nmea/Test_nmea_zda.cpp | 10 +++- test/nmea/Test_nmea_zdl.cpp | 10 +++- test/nmea/Test_nmea_zfo.cpp | 10 +++- test/nmea/Test_nmea_ztg.cpp | 10 +++- test/seatalk/Test_seatalk_message_00.cpp | 5 +- test/seatalk/Test_seatalk_message_01.cpp | 5 +- test/seatalk/Test_seatalk_message_05.cpp | 5 +- test/seatalk/Test_seatalk_message_10.cpp | 5 +- test/seatalk/Test_seatalk_message_11.cpp | 5 +- test/seatalk/Test_seatalk_message_20.cpp | 5 +- test/seatalk/Test_seatalk_message_21.cpp | 5 +- test/seatalk/Test_seatalk_message_22.cpp | 5 +- test/seatalk/Test_seatalk_message_23.cpp | 5 +- test/seatalk/Test_seatalk_message_24.cpp | 5 +- test/seatalk/Test_seatalk_message_25.cpp | 5 +- test/seatalk/Test_seatalk_message_26.cpp | 5 +- test/seatalk/Test_seatalk_message_27.cpp | 5 +- test/seatalk/Test_seatalk_message_30.cpp | 5 +- test/seatalk/Test_seatalk_message_36.cpp | 5 +- test/seatalk/Test_seatalk_message_38.cpp | 5 +- test/seatalk/Test_seatalk_message_50.cpp | 5 +- test/seatalk/Test_seatalk_message_51.cpp | 5 +- test/seatalk/Test_seatalk_message_52.cpp | 5 +- test/seatalk/Test_seatalk_message_53.cpp | 5 +- test/seatalk/Test_seatalk_message_54.cpp | 5 +- test/seatalk/Test_seatalk_message_56.cpp | 5 +- test/seatalk/Test_seatalk_message_58.cpp | 5 +- test/seatalk/Test_seatalk_message_59.cpp | 5 +- test/seatalk/Test_seatalk_message_65.cpp | 5 +- test/seatalk/Test_seatalk_message_66.cpp | 5 +- test/seatalk/Test_seatalk_message_6c.cpp | 5 +- test/seatalk/Test_seatalk_message_86.cpp | 5 +- test/seatalk/Test_seatalk_message_87.cpp | 5 +- test/seatalk/Test_seatalk_message_89.cpp | 5 +- 151 files changed, 1110 insertions(+), 293 deletions(-) diff --git a/bin/check-format b/bin/check-format index 1a57f5b3..63a9eb83 100755 --- a/bin/check-format +++ b/bin/check-format @@ -14,15 +14,13 @@ fi cd ${BASE} FILES=() for fn in $(find src test examples -type f -name "*.[ch]pp") ; do - d=$(${CLANG_FORMAT_BIN} $fn | diff $fn -) - if [ "x${d}" != "x" ] ; then + if [ "$(${CLANG_FORMAT_BIN} "$fn" | diff "$fn" -)" ] ; then FILES+=($fn) fi done # abort commit and show violating files if [ ${#FILES[@]} -gt 0 ] ; then - echo "error: files not formatted correctly:" for fn in ${FILES[@]} ; do echo " $fn" done diff --git a/examples/qtnmeadiag/MainWindow.cpp b/examples/qtnmeadiag/MainWindow.cpp index 095b92c5..21a25354 100644 --- a/examples/qtnmeadiag/MainWindow.cpp +++ b/examples/qtnmeadiag/MainWindow.cpp @@ -43,9 +43,15 @@ template static QString render(const marnav::utils::optional & t return marnav::nmea::to_string(*t).c_str(); } -static QString render(uint32_t t) { return QString{"%1"}.arg(t); } +static QString render(uint32_t t) +{ + return QString{"%1"}.arg(t); +} -static QString render(const std::string & t) { return QString{t.c_str()}; } +static QString render(const std::string & t) +{ + return QString{t.c_str()}; +} static QString render(const marnav::utils::optional & t) { @@ -376,7 +382,10 @@ MainWindow::MainWindow() port = new QSerialPort(this); } -MainWindow::~MainWindow() { on_close(); } +MainWindow::~MainWindow() +{ + on_close(); +} void MainWindow::create_menus() { diff --git a/examples/simple_seatalk_nmea_converter.cpp b/examples/simple_seatalk_nmea_converter.cpp index 3c7323e7..7ff52361 100644 --- a/examples/simple_seatalk_nmea_converter.cpp +++ b/examples/simple_seatalk_nmea_converter.cpp @@ -31,8 +31,8 @@ int main(int, char **) // mapping of conversion functions static const std::map> CONV - = { + std::function> + CONV = { {seatalk::message_id::depth_below_transducer, conv_depth_below_transducer}, }; diff --git a/src/marnav/ais/angle.cpp b/src/marnav/ais/angle.cpp index a11e8ffa..1f9706f3 100644 --- a/src/marnav/ais/angle.cpp +++ b/src/marnav/ais/angle.cpp @@ -51,8 +51,14 @@ static uint32_t deg_to_I4(double value, std::size_t bits) } // used only with static constant values, therefore compile time computation. -template double exp_10() { return 10.0 * exp_10(); } -template <> double exp_10<0>() { return 1.0; } +template double exp_10() +{ + return 10.0 * exp_10(); +} +template <> double exp_10<0>() +{ + return 1.0; +} template double round_n(double value) { diff --git a/src/marnav/ais/message.cpp b/src/marnav/ais/message.cpp index 84139921..449242a2 100644 --- a/src/marnav/ais/message.cpp +++ b/src/marnav/ais/message.cpp @@ -36,7 +36,10 @@ uint8_t encode_sixbit_ascii(char c) return i != SIXBIT_ASCII_TABLE.end() ? i->first : 0xff; } -std::string trim_ais_string(const std::string & s) { return s.substr(0, s.find_first_of("@")); } +std::string trim_ais_string(const std::string & s) +{ + return s.substr(0, s.find_first_of("@")); +} /// Reads a string from the AIS message at the specified offset. /// The string is decoded and returned. diff --git a/src/marnav/ais/message_05.cpp b/src/marnav/ais/message_05.cpp index bfeeaa1f..9e38070f 100644 --- a/src/marnav/ais/message_05.cpp +++ b/src/marnav/ais/message_05.cpp @@ -77,11 +77,20 @@ raw message_05::get_data() const return bits; } -std::string message_05::get_callsign() const { return trim_ais_string(callsign); } +std::string message_05::get_callsign() const +{ + return trim_ais_string(callsign); +} -std::string message_05::get_shipname() const { return trim_ais_string(shipname); } +std::string message_05::get_shipname() const +{ + return trim_ais_string(shipname); +} -std::string message_05::get_destination() const { return trim_ais_string(destination); } +std::string message_05::get_destination() const +{ + return trim_ais_string(destination); +} void message_05::set_callsign(const std::string & t) { diff --git a/src/marnav/ais/message_21.cpp b/src/marnav/ais/message_21.cpp index 6c29b8e9..bf652cca 100644 --- a/src/marnav/ais/message_21.cpp +++ b/src/marnav/ais/message_21.cpp @@ -92,7 +92,10 @@ raw message_21::get_data() const return bits; } -std::string message_21::get_name() const { return trim_ais_string(name); } +std::string message_21::get_name() const +{ + return trim_ais_string(name); +} void message_21::set_name(const std::string & t) { @@ -103,7 +106,10 @@ void message_21::set_name(const std::string & t) } } -std::string message_21::get_name_extension() const { return trim_ais_string(name_extension); } +std::string message_21::get_name_extension() const +{ + return trim_ais_string(name_extension); +} void message_21::set_name_extension(const std::string & t) { diff --git a/src/marnav/ais/message_24.cpp b/src/marnav/ais/message_24.cpp index fa89d088..3bc44e6c 100644 --- a/src/marnav/ais/message_24.cpp +++ b/src/marnav/ais/message_24.cpp @@ -32,7 +32,10 @@ message_24::message_24(const raw & bits) read_data(bits); } -bool message_24::is_auxiliary_vessel() const { return utils::mmsi{mmsi}.is_auxiliary(); } +bool message_24::is_auxiliary_vessel() const +{ + return utils::mmsi{mmsi}.is_auxiliary(); +} void message_24::read_data(const raw & bits) { @@ -89,11 +92,20 @@ raw message_24::get_data() const return bits; } -std::string message_24::get_shipname() const { return trim_ais_string(shipname); } +std::string message_24::get_shipname() const +{ + return trim_ais_string(shipname); +} -std::string message_24::get_vendor_id() const { return trim_ais_string(vendor_id); } +std::string message_24::get_vendor_id() const +{ + return trim_ais_string(vendor_id); +} -std::string message_24::get_callsign() const { return trim_ais_string(callsign); } +std::string message_24::get_callsign() const +{ + return trim_ais_string(callsign); +} void message_24::set_shipname(const std::string & t) { diff --git a/src/marnav/geo/angle.cpp b/src/marnav/geo/angle.cpp index e3f65d91..cba1806f 100644 --- a/src/marnav/geo/angle.cpp +++ b/src/marnav/geo/angle.cpp @@ -38,14 +38,20 @@ double angle::seconds() const noexcept return a; } -void swap(angle & a, angle & b) noexcept { std::swap(a.value, b.value); } +void swap(angle & a, angle & b) noexcept +{ + std::swap(a.value, b.value); +} bool operator==(const angle & a, const angle & b) noexcept { return (&a == &b) || math::is_same(a.get(), b.get(), angle::epsilon); } -bool operator!=(const angle & a, const angle & b) noexcept { return !(a == b); } +bool operator!=(const angle & a, const angle & b) noexcept +{ + return !(a == b); +} /// Constructs a latitude with the specified angle in degrees. latitude::latitude(double deg) @@ -89,7 +95,10 @@ bool operator==(const latitude & a, const latitude & b) noexcept return (&a == &b) || math::is_same(a.get(), b.get(), angle::epsilon); } -bool operator!=(const latitude & a, const latitude & b) noexcept { return !(a == b); } +bool operator!=(const latitude & a, const latitude & b) noexcept +{ + return !(a == b); +} void latitude::check(double a) { @@ -151,7 +160,10 @@ bool operator==(const longitude & a, const longitude & b) noexcept return (&a == &b) || math::is_same(a.get(), b.get(), angle::epsilon); } -bool operator!=(const longitude & a, const longitude & b) noexcept { return !(a == b); } +bool operator!=(const longitude & a, const longitude & b) noexcept +{ + return !(a == b); +} void longitude::check(double a) { diff --git a/src/marnav/geo/angle.hpp b/src/marnav/geo/angle.hpp index dd948feb..f4058af0 100644 --- a/src/marnav/geo/angle.hpp +++ b/src/marnav/geo/angle.hpp @@ -18,12 +18,18 @@ public: angle(const angle &) = default; angle(angle &&) noexcept = default; - constexpr angle() noexcept : value(0.0) {} + constexpr angle() noexcept + : value(0.0) + { + } /// Initializes the angle with the specified angle in degrees. /// /// @param[in] degrees Angle in degrees. - constexpr angle(double degrees) noexcept : value(degrees) {} + constexpr angle(double degrees) noexcept + : value(degrees) + { + } uint32_t degrees() const noexcept; uint32_t minutes() const noexcept; @@ -63,7 +69,10 @@ public: constexpr static const double min = -90.0; constexpr static const double max = +90.0; - constexpr latitude() noexcept : angle(0.0) {} + constexpr latitude() noexcept + : angle(0.0) + { + } latitude(double degrees); latitude(double degrees, hemisphere h); @@ -125,7 +134,10 @@ public: constexpr static const double min = -180.0; constexpr static const double max = +180.0; - constexpr longitude() noexcept : angle(0.0) {} + constexpr longitude() noexcept + : angle(0.0) + { + } longitude(double degrees); longitude(double degrees, hemisphere h); diff --git a/src/marnav/geo/geodesic.cpp b/src/marnav/geo/geodesic.cpp index b90b33d3..0ea9559e 100644 --- a/src/marnav/geo/geodesic.cpp +++ b/src/marnav/geo/geodesic.cpp @@ -21,7 +21,10 @@ static constexpr const double earth_semi_major_axis = 6378137.0; // [m] static constexpr const double earth_flattening = 1.0 / 298.257223563; /// Computes the square of the specified value. -template static T sqr(const T & a) { return a * a; } +template static T sqr(const T & a) +{ + return a * a; +} /// Returns the spherical angle between the two specified position in rad. /// @@ -149,8 +152,8 @@ double distance_ellipsoid_vincenty( B = u_sqr / 1024.0 * (256.0 + u_sqr * (-128.0 + u_sqr * (74.0 - 47.0 * u_sqr))); // eq 4 d_sigma = B * sin_sigma * (cos_2_sigma_m + B / 4.0 * (cos_sigma * (-1.0 + 2.0 * cos_sqr_2_sigma_m)) - - B / 6.0 * cos_2_sigma_m * (-3.0 + 4.0 * sin_sqr_sigma) - * (-3.0 + 4.0 * cos_sqr_2_sigma_m)); // eq 6 + - B / 6.0 * cos_2_sigma_m * (-3.0 + 4.0 * sin_sqr_sigma) + * (-3.0 + 4.0 * cos_sqr_2_sigma_m)); // eq 6 s = A * b * (sigma - d_sigma); // eq 7 alpha1 = atan((cos_U2 * sin_lambda) / (cos_U1 * sin_U2 - sin_U1 * cos_U2 * cos_lambda)); alpha2 = atan((cos_U1 * sin_lambda) / (-sin_U1 * cos_U2 + cos_U1 * sin_U2 * cos_lambda)); @@ -225,8 +228,7 @@ position point_ellipsoid_vincenty( cos_sqr_2_sigma_m = sqr(cos_2_sigma_m); cos_sigma = cos(sigma); sin_sigma = sin(sigma); - double delta_sigma - = B * sin_sigma + double delta_sigma = B * sin_sigma * (cos_2_sigma_m + B / 4.0 * (cos_sigma * (-1.0 + 2.0 * cos_sqr_2_sigma_m) - B / 6.0 * cos_2_sigma_m * (-3.0 + 4.0 * sqr(sin_sigma)) diff --git a/src/marnav/geo/region.cpp b/src/marnav/geo/region.cpp index 3080c5d3..13b57230 100644 --- a/src/marnav/geo/region.cpp +++ b/src/marnav/geo/region.cpp @@ -81,13 +81,25 @@ region::region(const position & a, double d_lat, double d_lon) p1 = position{t_lat, t_lon}; } -longitude region::left() const { return p0.lon(); } +longitude region::left() const +{ + return p0.lon(); +} -longitude region::right() const { return p1.lon(); } +longitude region::right() const +{ + return p1.lon(); +} -latitude region::top() const { return p0.lat(); } +latitude region::top() const +{ + return p0.lat(); +} -latitude region::bottom() const { return p1.lat(); } +latitude region::bottom() const +{ + return p1.lat(); +} /// Returns true if the specified position is inside (inclusive) /// the region. diff --git a/src/marnav/io/default_nmea_reader.cpp b/src/marnav/io/default_nmea_reader.cpp index a8d5f8d8..ca7db834 100644 --- a/src/marnav/io/default_nmea_reader.cpp +++ b/src/marnav/io/default_nmea_reader.cpp @@ -26,7 +26,9 @@ default_nmea_reader::default_nmea_reader(std::unique_ptr && dev) { } -default_nmea_reader::~default_nmea_reader() {} +default_nmea_reader::~default_nmea_reader() +{ +} /// Reads synchronously messages from the device. /// diff --git a/src/marnav/io/nmea_reader.cpp b/src/marnav/io/nmea_reader.cpp index eb7fdaab..3e2ccf28 100644 --- a/src/marnav/io/nmea_reader.cpp +++ b/src/marnav/io/nmea_reader.cpp @@ -6,7 +6,9 @@ namespace marnav { namespace io { -nmea_reader::~nmea_reader() {} +nmea_reader::~nmea_reader() +{ +} /// Initializes the reader, opens the device (if valid). /// diff --git a/src/marnav/io/seatalk_reader.cpp b/src/marnav/io/seatalk_reader.cpp index 1908caba..6a7eac34 100644 --- a/src/marnav/io/seatalk_reader.cpp +++ b/src/marnav/io/seatalk_reader.cpp @@ -5,7 +5,9 @@ namespace marnav { namespace io { -seatalk_reader::~seatalk_reader() {} +seatalk_reader::~seatalk_reader() +{ +} seatalk_reader::seatalk_reader(std::unique_ptr && dev) : dev(std::move(dev)) diff --git a/src/marnav/io/serial.cpp b/src/marnav/io/serial.cpp index 07cd9cc9..cc27e0f2 100644 --- a/src/marnav/io/serial.cpp +++ b/src/marnav/io/serial.cpp @@ -107,7 +107,10 @@ static tcflag_t get_parity_iflag(serial::parity par) } /// @endcond -serial::~serial() { close(); } +serial::~serial() +{ + close(); +} serial::serial(const std::string & dev, baud b, databits d, stopbits s, parity p) : fd(-1) diff --git a/src/marnav/nmea/ais_helper.hpp b/src/marnav/nmea/ais_helper.hpp index 8fda220d..4d1d32a2 100644 --- a/src/marnav/nmea/ais_helper.hpp +++ b/src/marnav/nmea/ais_helper.hpp @@ -30,7 +30,7 @@ namespace nmea /// @endcode template ::value && std::is_convertible>::value, + std::unique_ptr>::value, int>::type = 0> std::vector> collect_payload(InputIt begin, InputIt end) @@ -68,7 +68,7 @@ std::vector> collect_payload(InputIt begin, Inp /// @endcode template ::value && !std::is_convertible>::value, + std::unique_ptr>::value, int>::type = 0> std::vector> collect_payload(InputIt begin, InputIt end) diff --git a/src/marnav/nmea/angle.cpp b/src/marnav/nmea/angle.cpp index 8c9c23b7..57f9e2e6 100644 --- a/src/marnav/nmea/angle.cpp +++ b/src/marnav/nmea/angle.cpp @@ -41,7 +41,10 @@ static geo::angle parse_angle(const std::string & s) /// @code /// auto lat = nmea::parse_latitude("37.0000"); /// @endcode -geo::latitude parse_latitude(const std::string & s) { return geo::latitude{parse_angle(s)}; } +geo::latitude parse_latitude(const std::string & s) +{ + return geo::latitude{parse_angle(s)}; +} /// Returns the string representation of a latitude, in the form specified by the NMEA /// standard. @@ -67,7 +70,10 @@ std::string to_string(const geo::latitude & v) /// @code /// auto lon = nmea::parse_longitude("002.3456"); /// @endcode -geo::longitude parse_longitude(const std::string & s) { return geo::longitude{parse_angle(s)}; } +geo::longitude parse_longitude(const std::string & s) +{ + return geo::longitude{parse_angle(s)}; +} /// Returns the string representation of a longitude, in the form specified by the NMEA /// standard. diff --git a/src/marnav/nmea/checksum.cpp b/src/marnav/nmea/checksum.cpp index 566ed959..04dde9d3 100644 --- a/src/marnav/nmea/checksum.cpp +++ b/src/marnav/nmea/checksum.cpp @@ -15,7 +15,10 @@ checksum_error::checksum_error(uint8_t expected, uint8_t actual) /// @cond DEV namespace detail { -static constexpr char hex_digit(unsigned int t) noexcept { return "0123456789ABCDEF"[t & 0xf]; } +static constexpr char hex_digit(unsigned int t) noexcept +{ + return "0123456789ABCDEF"[t & 0xf]; +} } /// @endcond diff --git a/src/marnav/nmea/date.cpp b/src/marnav/nmea/date.cpp index e7190a3d..ed6822d7 100644 --- a/src/marnav/nmea/date.cpp +++ b/src/marnav/nmea/date.cpp @@ -53,13 +53,22 @@ bool date::check() const noexcept } /// Returns the year component. -uint32_t date::year() const noexcept { return y; } +uint32_t date::year() const noexcept +{ + return y; +} /// Returns the month component. -month date::mon() const noexcept { return m; } +month date::mon() const noexcept +{ + return m; +} /// Returns the day component. -uint32_t date::day() const noexcept { return d; } +uint32_t date::day() const noexcept +{ + return d; +} bool operator==(const date & a, const date & b) noexcept { diff --git a/src/marnav/nmea/manufacturer.cpp b/src/marnav/nmea/manufacturer.cpp index 6b534881..aed23fc1 100644 --- a/src/marnav/nmea/manufacturer.cpp +++ b/src/marnav/nmea/manufacturer.cpp @@ -18,7 +18,9 @@ struct entry final { std::string name; }; -entry::~entry() noexcept {} +entry::~entry() noexcept +{ +} using manufacturer_map = std::vector; @@ -592,7 +594,10 @@ static bool is_nmea(const std::string & tag) return (tag.size() == 3) || ((tag.size() == 5) && (tag[0] != 'P')); } -static bool is_unkown(const std::string & tag) { return (tag.size() < 4) || (tag[0] != 'P'); } +static bool is_unkown(const std::string & tag) +{ + return (tag.size() < 4) || (tag[0] != 'P'); +} } /// @endcond @@ -618,7 +623,10 @@ manufacturer_id get_manufacturer_id(const std::string & tag) /// /// @param[in] s Sentence to get the manufacturer ID from. /// @return The manufacturers ID. -manufacturer_id get_manufacturer_id(const sentence & s) { return get_manufacturer_id(s.tag()); } +manufacturer_id get_manufacturer_id(const sentence & s) +{ + return get_manufacturer_id(s.tag()); +} /// Returns the tag of the manufacturer specified by the ID. std::string get_manufacturer_tag(manufacturer_id id) diff --git a/src/marnav/nmea/pgrme.cpp b/src/marnav/nmea/pgrme.cpp index 69979e96..5dbdecbd 100644 --- a/src/marnav/nmea/pgrme.cpp +++ b/src/marnav/nmea/pgrme.cpp @@ -14,8 +14,7 @@ pgrme::pgrme() { } -pgrme::pgrme( - talker talk, fields::const_iterator first, fields::const_iterator last) +pgrme::pgrme(talker talk, fields::const_iterator first, fields::const_iterator last) : sentence(ID, TAG, talk) { if (std::distance(first, last) != 6) diff --git a/src/marnav/nmea/pgrmm.cpp b/src/marnav/nmea/pgrmm.cpp index 13c2a343..54fe5035 100644 --- a/src/marnav/nmea/pgrmm.cpp +++ b/src/marnav/nmea/pgrmm.cpp @@ -14,8 +14,7 @@ pgrmm::pgrmm() { } -pgrmm::pgrmm( - talker talk, fields::const_iterator first, fields::const_iterator last) +pgrmm::pgrmm(talker talk, fields::const_iterator first, fields::const_iterator last) : sentence(ID, TAG, talk) { if (std::distance(first, last) != 1) @@ -24,7 +23,10 @@ pgrmm::pgrmm( read(*(first + 0), map_datum); } -std::vector pgrmm::get_data() const { return {to_string(map_datum)}; } +std::vector pgrmm::get_data() const +{ + return {to_string(map_datum)}; +} void pgrmm::set_map_datum(const std::string & t) noexcept { diff --git a/src/marnav/nmea/pgrmz.cpp b/src/marnav/nmea/pgrmz.cpp index 290771ba..29e84f71 100644 --- a/src/marnav/nmea/pgrmz.cpp +++ b/src/marnav/nmea/pgrmz.cpp @@ -53,8 +53,7 @@ pgrmz::pgrmz() { } -pgrmz::pgrmz( - talker talk, fields::const_iterator first, fields::const_iterator last) +pgrmz::pgrmz(talker talk, fields::const_iterator first, fields::const_iterator last) : sentence(ID, TAG, talk) { if (std::distance(first, last) != 3) diff --git a/src/marnav/nmea/string.cpp b/src/marnav/nmea/string.cpp index fecbb695..31d67d70 100644 --- a/src/marnav/nmea/string.cpp +++ b/src/marnav/nmea/string.cpp @@ -12,11 +12,20 @@ std::string to_string(char data) return buf; } -std::string to_string(uint64_t data) { return std::to_string(data); } +std::string to_string(uint64_t data) +{ + return std::to_string(data); +} -std::string to_string(uint32_t data) { return std::to_string(data); } +std::string to_string(uint32_t data) +{ + return std::to_string(data); +} -std::string to_string(int32_t data) { return std::to_string(data); } +std::string to_string(int32_t data) +{ + return std::to_string(data); +} std::string to_string(double data) { @@ -25,7 +34,10 @@ std::string to_string(double data) return buf; } -std::string to_string(const std::string & data) { return data; } +std::string to_string(const std::string & data) +{ + return data; +} std::string to_string(side t) { diff --git a/src/marnav/nmea/time.cpp b/src/marnav/nmea/time.cpp index 115f11d7..45d5fc22 100644 --- a/src/marnav/nmea/time.cpp +++ b/src/marnav/nmea/time.cpp @@ -64,7 +64,10 @@ void trait_duration::check(uint32_t h, uint32_t m, uint32_t s, uint32_t ms) /// @param[in] str The string to parse. /// @return The parsed time. /// @exception std::invalid_argument Thrown if the string is malformed. -time time::parse(const std::string & str) { return parse_time