From 700d4403d5a0d4dc6094de9b72cde7c903b0ed93 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Thu, 26 Dec 2024 11:18:41 +0100 Subject: [PATCH] Transition to clang-format 19 --- .clang-format | 251 ++++++++++++-- docs/CHANGELOG.md | 1 + src/algorithms/PVT/libs/an_packet_printer.cc | 4 +- src/algorithms/PVT/libs/rinex_printer.cc | 308 +++++++++--------- src/algorithms/PVT/libs/rtcm.cc | 168 +++++----- src/algorithms/PVT/libs/rtklib_solver.cc | 8 +- ...alileo_e1_pcps_8ms_ambiguous_acquisition.h | 4 +- ...lileo_e1_pcps_ambiguous_acquisition_fpga.h | 2 +- ...leo_e1_pcps_cccwsr_ambiguous_acquisition.h | 2 +- ..._e1_pcps_quicksync_ambiguous_acquisition.h | 2 +- ...lileo_e1_pcps_tong_ambiguous_acquisition.h | 2 +- ...lileo_e5a_noncoherent_iq_acquisition_caf.h | 2 +- .../galileo_e5a_pcps_acquisition_fpga.h | 2 +- .../galileo_e5b_pcps_acquisition_fpga.h | 2 +- .../adapters/glonass_l1_ca_pcps_acquisition.h | 2 +- .../adapters/glonass_l2_ca_pcps_acquisition.h | 2 +- .../gps_l1_ca_pcps_acquisition_fine_doppler.h | 2 +- .../gps_l1_ca_pcps_acquisition_fpga.h | 2 +- .../gps_l1_ca_pcps_assisted_acquisition.h | 4 +- .../gps_l1_ca_pcps_opencl_acquisition.h | 4 +- .../gps_l1_ca_pcps_quicksync_acquisition.h | 2 +- .../gps_l1_ca_pcps_tong_acquisition.h | 2 +- .../adapters/gps_l2_m_pcps_acquisition_fpga.h | 2 +- .../adapters/gps_l5i_pcps_acquisition_fpga.h | 2 +- ...o_e5a_noncoherent_iq_acquisition_caf_cc.cc | 4 +- .../galileo_pcps_8ms_acquisition_cc.cc | 4 +- .../pcps_cccwsr_acquisition_cc.cc | 4 +- .../pcps_opencl_acquisition_cc.cc | 4 +- .../pcps_quicksync_acquisition_cc.cc | 4 +- .../pcps_tong_acquisition_cc.cc | 4 +- src/algorithms/libs/rtklib/rtklib_ppp.cc | 52 +-- src/algorithms/libs/rtklib/rtklib_rtkcmn.cc | 4 +- src/algorithms/libs/rtklib/rtklib_stream.cc | 8 +- .../apps/volk_gnsssdr_option_helpers.cc | 8 +- .../cpu_features/test/cpuinfo_aarch64_test.cc | 2 +- .../volk_gnsssdr/lib/qa_utils.h | 6 +- .../gr_complex_ip_packet_source.h | 4 +- .../glonass_l1_ca_telemetry_decoder_gs.h | 2 +- .../glonass_l2_ca_telemetry_decoder_gs.h | 2 +- .../sbas_l1_telemetry_decoder_gs.h | 2 +- .../libs/viterbi_decoder_sbas.cc | 2 +- .../tracking/libs/cuda_multicorrelator.h | 2 +- .../tracking/libs/nonlinear_tracking.h | 2 +- src/core/interfaces/gnss_block_interface.h | 6 +- src/core/libs/gnss_sdr_supl_client.cc | 6 +- src/core/libs/osnma_msg_receiver.cc | 2 +- src/core/libs/supl/types/asn_internal.h | 2 +- src/core/libs/supl/types/asn_system.h | 2 +- src/core/libs/supl/types/ber_tlv_tag.h | 2 +- src/core/receiver/control_thread.cc | 44 ++- src/core/receiver/gnss_flowgraph.cc | 48 +-- src/core/receiver/tcp_cmd_interface.cc | 12 +- src/core/system_parameters/GLONASS_L1_L2_CA.h | 7 +- src/core/system_parameters/Galileo_OSNMA.h | 2 +- .../system_parameters/galileo_inav_message.cc | 2 +- tests/common-files/gnuplot_i.h | 2 +- .../libs/spirent_motion_csv_dump_reader.cc | 2 +- tests/unit-tests/arithmetic/fft_speed_test.cc | 3 +- .../observables/hybrid_observables_test.cc | 2 +- .../hybrid_observables_test_fpga.cc | 2 +- .../pvt/rtklib_solver_test.cc | 4 +- .../tracking/cubature_filter_test.cc | 4 +- .../tracking/tracking_pull-in_test.cc | 4 +- .../tracking/tracking_pull-in_test_fpga.cc | 4 +- utils/front-end-cal/front_end_cal.cc | 16 +- utils/rinex-tools/obsdiff.cc | 6 +- 66 files changed, 628 insertions(+), 458 deletions(-) diff --git a/.clang-format b/.clang-format index 9a4adcd78..949f7e5a6 100644 --- a/.clang-format +++ b/.clang-format @@ -1,100 +1,289 @@ # SPDX-License-Identifier: GPL-3.0-or-later -# SPDX-FileCopyrightText: 2018-2020 Carles Fernandez-Prades +# SPDX-FileCopyrightText: 2018-2024 Carles Fernandez-Prades --- Language: Cpp # BasedOnStyle: Google # More info: https://clang.llvm.org/docs/ClangFormatStyleOptions.html AccessModifierOffset: -4 AlignAfterOpenBracket: DontAlign -AlignConsecutiveAssignments: false -AlignConsecutiveDeclarations: false -AlignEscapedNewlinesLeft: true -AlignOperands: true +AlignArrayOfStructures: None +AlignConsecutiveAssignments: + Enabled: false + AcrossEmptyLines: false + AcrossComments: false + AlignCompound: false + AlignFunctionPointers: false + PadOperators: true +AlignConsecutiveBitFields: + Enabled: false + AcrossEmptyLines: false + AcrossComments: false + AlignCompound: false + AlignFunctionPointers: false + PadOperators: false +AlignConsecutiveDeclarations: + Enabled: false + AcrossEmptyLines: false + AcrossComments: false + AlignCompound: false + AlignFunctionPointers: false + PadOperators: true +AlignConsecutiveMacros: + Enabled: false + AcrossEmptyLines: false + AcrossComments: false + AlignCompound: false + AlignFunctionPointers: false + PadOperators: false +AlignConsecutiveShortCaseStatements: + Enabled: false + AcrossEmptyLines: false + AcrossComments: false + AlignCaseArrows: false + AlignCaseColons: false +AlignConsecutiveTableGenBreakingDAGArgColons: + Enabled: false + AcrossEmptyLines: false + AcrossComments: false + AlignCompound: false + AlignFunctionPointers: false + PadOperators: false +AlignConsecutiveTableGenCondOperatorColons: + Enabled: false + AcrossEmptyLines: false + AcrossComments: false + AlignCompound: false + AlignFunctionPointers: false + PadOperators: false +AlignConsecutiveTableGenDefinitionColons: + Enabled: false + AcrossEmptyLines: false + AcrossComments: false + AlignCompound: false + AlignFunctionPointers: false + PadOperators: false +AlignEscapedNewlines: Left +AlignOperands: Align AlignTrailingComments: - Kind: Always + Kind: Always + OverEmptyLines: 0 +AllowAllArgumentsOnNextLine: true AllowAllParametersOfDeclarationOnNextLine: true -AllowShortBlocksOnASingleLine: false +AllowBreakBeforeNoexceptSpecifier: Never +AllowShortBlocksOnASingleLine: Never +AllowShortCaseExpressionOnASingleLine: true AllowShortCaseLabelsOnASingleLine: false +AllowShortCompoundRequirementOnASingleLine: true +AllowShortEnumsOnASingleLine: true AllowShortFunctionsOnASingleLine: All -AllowShortIfStatementsOnASingleLine: true +AllowShortIfStatementsOnASingleLine: WithoutElse +AllowShortLambdasOnASingleLine: All AllowShortLoopsOnASingleLine: true AlwaysBreakAfterDefinitionReturnType: None -AlwaysBreakAfterReturnType: None AlwaysBreakBeforeMultilineStrings: true -AlwaysBreakTemplateDeclarations: false +AttributeMacros: + - __capability BinPackArguments: true BinPackParameters: true +BitFieldColonSpacing: Both BraceWrapping: - AfterClass: false - AfterControlStatement: false - AfterEnum: false - AfterFunction: false - AfterNamespace: false - AfterObjCDeclaration: false - AfterStruct: false - AfterUnion: false - BeforeCatch: false - BeforeElse: false - IndentBraces: false + AfterCaseLabel: true + AfterClass: true + AfterControlStatement: Always + AfterEnum: true + AfterExternBlock: true + AfterFunction: true + AfterNamespace: true + AfterObjCDeclaration: true + AfterStruct: true + AfterUnion: true + BeforeCatch: true + BeforeElse: true + BeforeLambdaBody: false + BeforeWhile: true + IndentBraces: true + SplitEmptyFunction: true + SplitEmptyRecord: true + SplitEmptyNamespace: true +BreakAdjacentStringLiterals: true +BreakAfterAttributes: Leave +BreakAfterJavaFieldAnnotations: false +BreakAfterReturnType: None +BreakArrays: true BreakBeforeBinaryOperators: None +BreakBeforeConceptDeclarations: Always BreakBeforeBraces: GNU +BreakBeforeInlineASMColon: OnlyMultiline BreakBeforeTernaryOperators: true -BreakConstructorInitializersBeforeComma: false +BreakConstructorInitializers: BeforeColon +BreakFunctionDefinitionParameters: false +BreakInheritanceList: BeforeColon +BreakStringLiterals: true +BreakTemplateDeclarations: MultiLine ColumnLimit: 0 CommentPragmas: '^ IWYU pragma:' -ConstructorInitializerAllOnOneLineOrOnePerLine: true +CompactNamespaces: false ConstructorInitializerIndentWidth: 4 ContinuationIndentWidth: 4 Cpp11BracedListStyle: true DerivePointerAlignment: true DisableFormat: false +EmptyLineAfterAccessModifier: Never +EmptyLineBeforeAccessModifier: LogicalBlock ExperimentalAutoDetectBinPacking: false -ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ] -IncludeBlocks: Merge +FixNamespaceComments: true +ForEachMacros: + - foreach + - Q_FOREACH + - BOOST_FOREACH +IfMacros: + - KJ_IF_MAYBE +IncludeBlocks: Merge IncludeCategories: - Regex: '^.*.h"' Priority: 1 + SortPriority: 0 + CaseSensitive: false - Regex: '^.*(benchmark|boost|gflags|glog|gnsssdr|gnuradio|gnsstk|gsl|gtest|pmt|uhd|volk)/' Priority: 2 + SortPriority: 0 + CaseSensitive: false - Regex: '^.*(armadillo|iio|matio|pugixml)' Priority: 2 + SortPriority: 0 + CaseSensitive: false - Regex: '.*' Priority: 3 + SortPriority: 0 + CaseSensitive: false - Regex: '^<.*\.h>' Priority: 4 + SortPriority: 0 + CaseSensitive: false - Regex: '^<.*' Priority: 5 + SortPriority: 0 + CaseSensitive: false +IncludeIsMainRegex: '(Test)?$' +IncludeIsMainSourceRegex: '' +IndentAccessModifiers: false +IndentCaseBlocks: false IndentCaseLabels: false +IndentExternBlock: AfterExternBlock +IndentGotoLabels: true +IndentPPDirectives: None +IndentRequiresClause: true IndentWidth: 4 IndentWrappedFunctionNames: false -KeepEmptyLinesAtTheStartOfBlocks: false +InsertBraces: false +InsertNewlineAtEOF: false +InsertTrailingCommas: None +IntegerLiteralSeparator: + Binary: 0 + BinaryMinDigits: 0 + Decimal: 0 + DecimalMinDigits: 0 + Hex: 0 + HexMinDigits: 0 +JavaScriptQuotes: Leave +JavaScriptWrapImports: true +KeepEmptyLines: + AtEndOfFile: false + AtStartOfBlock: false + AtStartOfFile: true +LambdaBodyIndentation: Signature +LineEnding: DeriveLF MacroBlockBegin: '' MacroBlockEnd: '' +MainIncludeChar: Quote MaxEmptyLinesToKeep: 2 NamespaceIndentation: None +ObjCBinPackProtocolList: Auto ObjCBlockIndentWidth: 2 +ObjCBreakBeforeNestedBlockParam: true ObjCSpaceAfterProperty: false ObjCSpaceBeforeProtocolList: false +PackConstructorInitializers: NextLine +PenaltyBreakAssignment: 2 PenaltyBreakBeforeFirstCallParameter: 1 PenaltyBreakComment: 300 PenaltyBreakFirstLessLess: 120 +PenaltyBreakOpenParenthesis: 0 +PenaltyBreakScopeResolution: 500 PenaltyBreakString: 1000 +PenaltyBreakTemplateDeclaration: 10 PenaltyExcessCharacter: 1000000 +PenaltyIndentedWhitespace: 0 PenaltyReturnTypeOnItsOwnLine: 200 PointerAlignment: Left +PPIndentWidth: -1 +QualifierAlignment: Leave +ReferenceAlignment: Pointer ReflowComments: true -SortIncludes: true +RemoveBracesLLVM: false +RemoveParentheses: Leave +RemoveSemicolon: false +RequiresClausePosition: OwnLine +RequiresExpressionIndentation: OuterScope +SeparateDefinitionBlocks: Leave +ShortNamespaceLines: 1 +SkipMacroDefinitionBody: false +SortIncludes: CaseSensitive +SortJavaStaticImport: Before +SortUsingDeclarations: LexicographicNumeric SpaceAfterCStyleCast: false +SpaceAfterLogicalNot: false +SpaceAfterTemplateKeyword: true +SpaceAroundPointerQualifiers: Default SpaceBeforeAssignmentOperators: true +SpaceBeforeCaseColon: false +SpaceBeforeCpp11BracedList: false +SpaceBeforeCtorInitializerColon: true +SpaceBeforeInheritanceColon: true +SpaceBeforeJsonColon: false SpaceBeforeParens: ControlStatements -SpaceInEmptyParentheses: false +SpaceBeforeParensOptions: + AfterControlStatements: true + AfterForeachMacros: true + AfterFunctionDefinitionName: false + AfterFunctionDeclarationName: false + AfterIfMacros: true + AfterOverloadedOperator: false + AfterPlacementOperator: true + AfterRequiresInClause: false + AfterRequiresInExpression: false + BeforeNonEmptyParentheses: false +SpaceBeforeRangeBasedForLoopColon: true +SpaceBeforeSquareBrackets: false +SpaceInEmptyBlock: false SpacesBeforeTrailingComments: 2 -SpacesInAngles: false +SpacesInAngles: Never SpacesInContainerLiterals: true -SpacesInCStyleCastParentheses: false -SpacesInParentheses: false +SpacesInLineCommentPrefix: + Minimum: 1 + Maximum: -1 +SpacesInParens: Never +SpacesInParensOptions: + ExceptDoubleParentheses: false + InCStyleCasts: false + InConditionalStatements: false + InEmptyParentheses: false + Other: false SpacesInSquareBrackets: false Standard: Auto +StatementAttributeLikeMacros: + - Q_EMIT +StatementMacros: + - Q_UNUSED + - QT_REQUIRE_VERSION +TableGenBreakInsideDAGArg: DontBreak TabWidth: 8 UseTab: Never +VerilogBreakBetweenInstancePorts: true +WhitespaceSensitiveMacros: + - BOOST_PP_STRINGIZE + - CF_SWIFT_NAME + - NS_SWIFT_NAME + - PP_STRINGIZE + - STRINGIZE ... diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index a3e27ac9a..5654ecf6b 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -62,6 +62,7 @@ All notable changes to GNSS-SDR will be documented in this file. - Updated GSL implementation to v0.42.0. See the [gsl-lite release](https://github.com/gsl-lite/gsl-lite/releases/tag/v0.42.0). +- Code formatting now based on clang-format 19. ### Improvements in Portability: diff --git a/src/algorithms/PVT/libs/an_packet_printer.cc b/src/algorithms/PVT/libs/an_packet_printer.cc index 22d31371b..f14790b4d 100644 --- a/src/algorithms/PVT/libs/an_packet_printer.cc +++ b/src/algorithms/PVT/libs/an_packet_printer.cc @@ -107,8 +107,8 @@ void An_Packet_Printer::update_sdr_gnss_packet(sdr_gnss_packet_t* _packet, const const int max_reported_sats = *(&_packet->sats + 1) - _packet->sats; for (gnss_observables_iter = gnss_observables_map.cbegin(); - gnss_observables_iter != gnss_observables_map.cend(); - ++gnss_observables_iter) + gnss_observables_iter != gnss_observables_map.cend(); + ++gnss_observables_iter) { if (gnss_observables_iter->second.Flag_valid_pseudorange) { diff --git a/src/algorithms/PVT/libs/rinex_printer.cc b/src/algorithms/PVT/libs/rinex_printer.cc index 0e4367ea2..6abca2750 100644 --- a/src/algorithms/PVT/libs/rinex_printer.cc +++ b/src/algorithms/PVT/libs/rinex_printer.cc @@ -4942,8 +4942,8 @@ void Rinex_Printer::log_rinex_nav(std::fstream& out, const std::map::const_iterator gps_ephemeris_iter; for (gps_ephemeris_iter = eph_map.cbegin(); - gps_ephemeris_iter != eph_map.cend(); - gps_ephemeris_iter++) + gps_ephemeris_iter != eph_map.cend(); + gps_ephemeris_iter++) { // -------- SV / EPOCH / SV CLK const boost::posix_time::ptime p_utc_time = Rinex_Printer::compute_GPS_time(gps_ephemeris_iter->second, gps_ephemeris_iter->second.toc); @@ -5329,8 +5329,8 @@ void Rinex_Printer::log_rinex_nav(std::fstream& out, const std::map::const_iterator gps_ephemeris_iter; for (gps_ephemeris_iter = eph_map.cbegin(); - gps_ephemeris_iter != eph_map.cend(); - gps_ephemeris_iter++) + gps_ephemeris_iter != eph_map.cend(); + gps_ephemeris_iter++) { // -------- SV / EPOCH / SV CLK const boost::posix_time::ptime p_utc_time = Rinex_Printer::compute_GPS_time(gps_ephemeris_iter->second, gps_ephemeris_iter->second.toc); @@ -5497,8 +5497,8 @@ void Rinex_Printer::log_rinex_nav(std::fstream& out, const std::map::const_iterator galileo_ephemeris_iter; line.clear(); for (galileo_ephemeris_iter = eph_map.cbegin(); - galileo_ephemeris_iter != eph_map.cend(); - galileo_ephemeris_iter++) + galileo_ephemeris_iter != eph_map.cend(); + galileo_ephemeris_iter++) { // -------- SV / EPOCH / SV CLK const boost::posix_time::ptime p_utc_time = Rinex_Printer::compute_Galileo_time(galileo_ephemeris_iter->second, galileo_ephemeris_iter->second.toe); @@ -5688,8 +5688,8 @@ void Rinex_Printer::log_rinex_nav(std::fstream& out, const std::map::const_iterator glonass_gnav_ephemeris_iter; for (glonass_gnav_ephemeris_iter = eph_map.cbegin(); - glonass_gnav_ephemeris_iter != eph_map.cend(); - glonass_gnav_ephemeris_iter++) + glonass_gnav_ephemeris_iter != eph_map.cend(); + glonass_gnav_ephemeris_iter++) { // -------- SV / EPOCH / SV CLK const boost::posix_time::ptime p_utc_time = glonass_gnav_ephemeris_iter->second.glot_to_utc(glonass_gnav_ephemeris_iter->second.d_t_b, 0.0); @@ -5933,8 +5933,8 @@ void Rinex_Printer::log_rinex_nav(std::fstream& out, const std::map::const_iterator bds_ephemeris_iter; for (bds_ephemeris_iter = eph_map.cbegin(); - bds_ephemeris_iter != eph_map.cend(); - bds_ephemeris_iter++) + bds_ephemeris_iter != eph_map.cend(); + bds_ephemeris_iter++) { // -------- SV / EPOCH / SV CLK const boost::posix_time::ptime p_utc_time = Rinex_Printer::compute_BDS_time(bds_ephemeris_iter->second, bds_ephemeris_iter->second.toc); @@ -10278,15 +10278,15 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Glonass_Gnav_Ephemeri int32_t numSatellitesObserved = 0; std::map::const_iterator observables_iter; for (observables_iter = observables.cbegin(); - observables_iter != observables.cend(); - observables_iter++) + observables_iter != observables.cend(); + observables_iter++) { numSatellitesObserved++; } line += Rinex_Printer::rightJustify(std::to_string(numSatellitesObserved), 3); for (observables_iter = observables.cbegin(); - observables_iter != observables.cend(); - observables_iter++) + observables_iter != observables.cend(); + observables_iter++) { const auto satsys = satelliteSystem.find("GLONASS"); if (satsys != satelliteSystem.cend()) @@ -10306,8 +10306,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Glonass_Gnav_Ephemeri out << line << '\n'; for (observables_iter = observables.cbegin(); - observables_iter != observables.cend(); - observables_iter++) + observables_iter != observables.cend(); + observables_iter++) { std::string lineObs; lineObs.clear(); @@ -10392,8 +10392,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Glonass_Gnav_Ephemeri int32_t numSatellitesObserved = 0; std::map::const_iterator observables_iter; for (observables_iter = observables.cbegin(); - observables_iter != observables.cend(); - observables_iter++) + observables_iter != observables.cend(); + observables_iter++) { numSatellitesObserved++; } @@ -10408,8 +10408,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Glonass_Gnav_Ephemeri const auto satsys = satelliteSystem.find("GLONASS"); for (observables_iter = observables.cbegin(); - observables_iter != observables.cend(); - observables_iter++) + observables_iter != observables.cend(); + observables_iter++) { std::string lineObs; lineObs.clear(); @@ -10574,8 +10574,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& gps_ep std::map::const_iterator observables_iter; for (observables_iter = observables.cbegin(); - observables_iter != observables.cend(); - observables_iter++) + observables_iter != observables.cend(); + observables_iter++) { const std::string system_(&observables_iter->second.System, 1); const std::string sig_(observables_iter->second.Signal); @@ -10597,8 +10597,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& gps_ep std::set available_glo_prns; std::set::iterator it; for (observables_iter = observablesR1C.cbegin(); - observables_iter != observablesR1C.cend(); - observables_iter++) + observables_iter != observablesR1C.cend(); + observables_iter++) { const uint32_t prn_ = observables_iter->second.PRN; total_glo_map.insert(std::pair(prn_, observables_iter->second)); @@ -10610,8 +10610,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& gps_ep } for (observables_iter = observablesR2C.cbegin(); - observables_iter != observablesR2C.cend(); - observables_iter++) + observables_iter != observablesR2C.cend(); + observables_iter++) { const uint32_t prn_ = observables_iter->second.PRN; total_glo_map.insert(std::pair(prn_, observables_iter->second)); @@ -10631,8 +10631,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& gps_ep // Add list of GPS satellites const auto satsys_gps = satelliteSystem.find("GPS"); for (observables_iter = observablesG1C.cbegin(); - observables_iter != observablesG1C.cend(); - observables_iter++) + observables_iter != observablesG1C.cend(); + observables_iter++) { if (satsys_gps != satelliteSystem.cend()) { @@ -10647,8 +10647,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& gps_ep // Add list of GLONASS L1 satellites const auto satsys_glo = satelliteSystem.find("GLONASS"); for (observables_iter = observablesR1C.cbegin(); - observables_iter != observablesR1C.cend(); - observables_iter++) + observables_iter != observablesR1C.cend(); + observables_iter++) { if (satsys_glo != satelliteSystem.cend()) { @@ -10662,8 +10662,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& gps_ep } // Add list of GLONASS L2 satellites for (observables_iter = observablesR2C.cbegin(); - observables_iter != observablesR2C.cend(); - observables_iter++) + observables_iter != observablesR2C.cend(); + observables_iter++) { if (satsys_glo != satelliteSystem.cend()) { @@ -10684,8 +10684,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& gps_ep std::string s; std::string lineObs; for (observables_iter = observablesG1C.cbegin(); - observables_iter != observablesG1C.cend(); - observables_iter++) + observables_iter != observablesG1C.cend(); + observables_iter++) { lineObs.clear(); @@ -10770,8 +10770,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& gps_ep std::pair::iterator, std::multimap::iterator> ret; for (it = available_glo_prns.cbegin(); - it != available_glo_prns.cend(); - it++) + it != available_glo_prns.cend(); + it++) { lineObs.clear(); if (d_version == 3) @@ -10898,8 +10898,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_CNAV_Ephemeris& g std::map::const_iterator observables_iter; for (observables_iter = observables.cbegin(); - observables_iter != observables.cend(); - observables_iter++) + observables_iter != observables.cend(); + observables_iter++) { const std::string system_(&observables_iter->second.System, 1); const std::string sig_(observables_iter->second.Signal); @@ -10921,8 +10921,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_CNAV_Ephemeris& g std::set available_glo_prns; std::set::iterator it; for (observables_iter = observablesR1C.cbegin(); - observables_iter != observablesR1C.cend(); - observables_iter++) + observables_iter != observablesR1C.cend(); + observables_iter++) { const uint32_t prn_ = observables_iter->second.PRN; total_glo_map.insert(std::pair(prn_, observables_iter->second)); @@ -10934,8 +10934,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_CNAV_Ephemeris& g } for (observables_iter = observablesR2C.cbegin(); - observables_iter != observablesR2C.cend(); - observables_iter++) + observables_iter != observablesR2C.cend(); + observables_iter++) { const uint32_t prn_ = observables_iter->second.PRN; total_glo_map.insert(std::pair(prn_, observables_iter->second)); @@ -10961,8 +10961,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_CNAV_Ephemeris& g const auto satsys_gps = satelliteSystem.find("GPS"); const auto satsys = satelliteSystem.find("GLONASS"); for (observables_iter = observablesG2S.cbegin(); - observables_iter != observablesG2S.cend(); - observables_iter++) + observables_iter != observablesG2S.cend(); + observables_iter++) { lineObs.clear(); @@ -11042,8 +11042,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_CNAV_Ephemeris& g std::pair::iterator, std::multimap::iterator> ret; for (it = available_glo_prns.cbegin(); - it != available_glo_prns.cend(); - it++) + it != available_glo_prns.cend(); + it++) { lineObs.clear(); if (satsys != satelliteSystem.cend()) @@ -11167,8 +11167,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Galileo_Ephemeris& ga std::map::const_iterator observables_iter; for (observables_iter = observables.cbegin(); - observables_iter != observables.cend(); - observables_iter++) + observables_iter != observables.cend(); + observables_iter++) { const std::string system_(&observables_iter->second.System, 1); const std::string sig_(observables_iter->second.Signal); @@ -11190,8 +11190,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Galileo_Ephemeris& ga std::set available_glo_prns; std::set::iterator it; for (observables_iter = observablesR1C.cbegin(); - observables_iter != observablesR1C.cend(); - observables_iter++) + observables_iter != observablesR1C.cend(); + observables_iter++) { const uint32_t prn_ = observables_iter->second.PRN; total_glo_map.insert(std::pair(prn_, observables_iter->second)); @@ -11202,8 +11202,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Galileo_Ephemeris& ga } } for (observables_iter = observablesR2C.cbegin(); - observables_iter != observablesR2C.cend(); - observables_iter++) + observables_iter != observablesR2C.cend(); + observables_iter++) { const uint32_t prn_ = observables_iter->second.PRN; total_glo_map.insert(std::pair(prn_, observables_iter->second)); @@ -11231,8 +11231,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Galileo_Ephemeris& ga const auto satsys_gal = satelliteSystem.find("Galileo"); const auto satsys = satelliteSystem.find("GLONASS"); for (observables_iter = observablesE1B.cbegin(); - observables_iter != observablesE1B.cend(); - observables_iter++) + observables_iter != observablesE1B.cend(); + observables_iter++) { lineObs.clear(); @@ -11309,8 +11309,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Galileo_Ephemeris& ga std::pair::iterator, std::multimap::iterator> ret; for (it = available_glo_prns.cbegin(); - it != available_glo_prns.cend(); - it++) + it != available_glo_prns.cend(); + it++) { lineObs.clear(); if (satsys_gal != satelliteSystem.cend()) @@ -11439,15 +11439,15 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& eph, d int32_t numSatellitesObserved = 0; std::map::const_iterator observables_iter; for (observables_iter = observables.cbegin(); - observables_iter != observables.cend(); - observables_iter++) + observables_iter != observables.cend(); + observables_iter++) { numSatellitesObserved++; } line += Rinex_Printer::rightJustify(std::to_string(numSatellitesObserved), 3); for (observables_iter = observables.cbegin(); - observables_iter != observables.cend(); - observables_iter++) + observables_iter != observables.cend(); + observables_iter++) { const auto satsys = satelliteSystem.find("GPS"); if (satsys != satelliteSystem.cend()) @@ -11467,8 +11467,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& eph, d out << line << '\n'; for (observables_iter = observables.cbegin(); - observables_iter != observables.cend(); - observables_iter++) + observables_iter != observables.cend(); + observables_iter++) { std::string lineObs; lineObs.clear(); @@ -11554,8 +11554,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& eph, d int32_t numSatellitesObserved = 0; std::map::const_iterator observables_iter; for (observables_iter = observables.cbegin(); - observables_iter != observables.cend(); - observables_iter++) + observables_iter != observables.cend(); + observables_iter++) { numSatellitesObserved++; } @@ -11570,8 +11570,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& eph, d const auto satsys_gps = satelliteSystem.find("GPS"); for (observables_iter = observables.cbegin(); - observables_iter != observables.cend(); - observables_iter++) + observables_iter != observables.cend(); + observables_iter++) { std::string lineObs; lineObs.clear(); @@ -11685,8 +11685,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_CNAV_Ephemeris& e int32_t numSatellitesObserved = 0; std::map::const_iterator observables_iter; for (observables_iter = observables.cbegin(); - observables_iter != observables.cend(); - observables_iter++) + observables_iter != observables.cend(); + observables_iter++) { numSatellitesObserved++; } @@ -11701,8 +11701,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_CNAV_Ephemeris& e const auto satsys_gps = satelliteSystem.find("GPS"); for (observables_iter = observables.cbegin(); - observables_iter != observables.cend(); - observables_iter++) + observables_iter != observables.cend(); + observables_iter++) { std::string lineObs; lineObs.clear(); @@ -11826,8 +11826,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& eph, c std::multimap total_mmap; std::multimap::iterator mmap_iter; for (observables_iter = observables.cbegin(); - observables_iter != observables.cend(); - observables_iter++) + observables_iter != observables.cend(); + observables_iter++) { const std::string system_(&observables_iter->second.System, 1); const std::string sig_(observables_iter->second.Signal); @@ -11865,8 +11865,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& eph, c std::multimap mmap_aux; mmap_aux = total_mmap; for (mmap_iter = mmap_aux.begin(); - mmap_iter != mmap_aux.end(); - mmap_iter++) + mmap_iter != mmap_aux.end(); + mmap_iter++) { if ((total_mmap.count(mmap_iter->second.PRN)) == 1 && (mmap_iter->second.PRN != 0)) { @@ -11883,8 +11883,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& eph, c std::set available_prns; std::set::iterator it; for (observables_iter = observablesL1.cbegin(); - observables_iter != observablesL1.cend(); - observables_iter++) + observables_iter != observablesL1.cend(); + observables_iter++) { const uint32_t prn_ = observables_iter->second.PRN; it = available_prns.find(prn_); @@ -11895,8 +11895,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& eph, c } for (observables_iter = observablesL2.cbegin(); - observables_iter != observablesL2.cend(); - observables_iter++) + observables_iter != observablesL2.cend(); + observables_iter++) { const uint32_t prn_ = observables_iter->second.PRN; it = available_prns.find(prn_); @@ -11907,8 +11907,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& eph, c } for (observables_iter = observablesL5.cbegin(); - observables_iter != observablesL5.cend(); - observables_iter++) + observables_iter != observablesL5.cend(); + observables_iter++) { const uint32_t prn_ = observables_iter->second.PRN; it = available_prns.find(prn_); @@ -11930,8 +11930,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& eph, c const auto satsys_gps = satelliteSystem.find("GPS"); std::pair::iterator, std::multimap::iterator> ret; for (it = available_prns.cbegin(); - it != available_prns.cend(); - it++) + it != available_prns.cend(); + it++) { lineObs.clear(); if (satsys_gps != satelliteSystem.cend()) @@ -12063,8 +12063,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Galileo_Ephemeris& ep std::map::const_iterator observables_iter; for (observables_iter = observables.cbegin(); - observables_iter != observables.cend(); - observables_iter++) + observables_iter != observables.cend(); + observables_iter++) { const std::string system_(&observables_iter->second.System, 1); const std::string sig_(observables_iter->second.Signal); @@ -12096,8 +12096,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Galileo_Ephemeris& ep if (found_1B != std::string::npos) { for (observables_iter = observablesE1B.cbegin(); - observables_iter != observablesE1B.cend(); - observables_iter++) + observables_iter != observablesE1B.cend(); + observables_iter++) { const uint32_t prn_ = observables_iter->second.PRN; total_map.insert(std::pair(prn_, observables_iter->second)); @@ -12111,8 +12111,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Galileo_Ephemeris& ep if (found_E5a != std::string::npos) { for (observables_iter = observablesE5A.cbegin(); - observables_iter != observablesE5A.cend(); - observables_iter++) + observables_iter != observablesE5A.cend(); + observables_iter++) { const uint32_t prn_ = observables_iter->second.PRN; it = available_prns.find(prn_); @@ -12136,8 +12136,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Galileo_Ephemeris& ep if (found_E5b != std::string::npos) { for (observables_iter = observablesE5B.cbegin(); - observables_iter != observablesE5B.cend(); - observables_iter++) + observables_iter != observablesE5B.cend(); + observables_iter++) { const uint32_t prn_ = observables_iter->second.PRN; it = available_prns.find(prn_); @@ -12162,8 +12162,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Galileo_Ephemeris& ep if (found_E6b != std::string::npos) { for (observables_iter = observablesE6B.cbegin(); - observables_iter != observablesE6B.cend(); - observables_iter++) + observables_iter != observablesE6B.cend(); + observables_iter++) { const uint32_t prn_ = observables_iter->second.PRN; total_map.insert(std::pair(prn_, observables_iter->second)); @@ -12187,8 +12187,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Galileo_Ephemeris& ep std::pair::iterator, std::multimap::iterator> ret; const auto satsys_gal = satelliteSystem.find("Galileo"); for (it = available_prns.cbegin(); - it != available_prns.cend(); - it++) + it != available_prns.cend(); + it++) { lineObs.clear(); if (satsys_gal != satelliteSystem.cend()) @@ -12311,8 +12311,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& gps_ep std::map::const_iterator observables_iter; for (observables_iter = observables.cbegin(); - observables_iter != observables.cend(); - observables_iter++) + observables_iter != observables.cend(); + observables_iter++) { const std::string system_(&observables_iter->second.System, 1); const std::string sig_(observables_iter->second.Signal); @@ -12342,8 +12342,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& gps_ep std::set available_gal_prns; std::set::iterator it; for (observables_iter = observablesE1B.cbegin(); - observables_iter != observablesE1B.cend(); - observables_iter++) + observables_iter != observablesE1B.cend(); + observables_iter++) { const uint32_t prn_ = observables_iter->second.PRN; total_gal_map.insert(std::pair(prn_, observables_iter->second)); @@ -12355,8 +12355,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& gps_ep } for (observables_iter = observablesE5A.cbegin(); - observables_iter != observablesE5A.cend(); - observables_iter++) + observables_iter != observablesE5A.cend(); + observables_iter++) { const uint32_t prn_ = observables_iter->second.PRN; total_gal_map.insert(std::pair(prn_, observables_iter->second)); @@ -12368,8 +12368,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& gps_ep } for (observables_iter = observablesE5B.cbegin(); - observables_iter != observablesE5B.cend(); - observables_iter++) + observables_iter != observablesE5B.cend(); + observables_iter++) { const uint32_t prn_ = observables_iter->second.PRN; total_gal_map.insert(std::pair(prn_, observables_iter->second)); @@ -12381,8 +12381,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& gps_ep } for (observables_iter = observablesE6B.cbegin(); - observables_iter != observablesE6B.cend(); - observables_iter++) + observables_iter != observablesE6B.cend(); + observables_iter++) { const uint32_t prn_ = observables_iter->second.PRN; total_gal_map.insert(std::pair(prn_, observables_iter->second)); @@ -12411,8 +12411,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& gps_ep const auto satsys_gal = satelliteSystem.find("Galileo"); for (observables_iter = observablesG1C.cbegin(); - observables_iter != observablesG1C.cend(); - observables_iter++) + observables_iter != observablesG1C.cend(); + observables_iter++) { lineObs.clear(); @@ -12489,8 +12489,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& gps_ep std::pair::iterator, std::multimap::iterator> ret; for (it = available_gal_prns.cbegin(); - it != available_gal_prns.cend(); - it++) + it != available_gal_prns.cend(); + it++) { lineObs.clear(); if (satsys_gal != satelliteSystem.cend()) @@ -12614,8 +12614,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_CNAV_Ephemeris& e std::map::const_iterator observables_iter; for (observables_iter = observables.cbegin(); - observables_iter != observables.cend(); - observables_iter++) + observables_iter != observables.cend(); + observables_iter++) { const std::string system_(&observables_iter->second.System, 1); const std::string sig_(observables_iter->second.Signal); @@ -12651,8 +12651,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_CNAV_Ephemeris& e std::set available_gps_prns; std::set::iterator it; for (observables_iter = observablesE1B.cbegin(); - observables_iter != observablesE1B.cend(); - observables_iter++) + observables_iter != observablesE1B.cend(); + observables_iter++) { const uint32_t prn_ = observables_iter->second.PRN; total_gal_map.insert(std::pair(prn_, observables_iter->second)); @@ -12664,8 +12664,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_CNAV_Ephemeris& e } for (observables_iter = observablesE5A.cbegin(); - observables_iter != observablesE5A.cend(); - observables_iter++) + observables_iter != observablesE5A.cend(); + observables_iter++) { const uint32_t prn_ = observables_iter->second.PRN; total_gal_map.insert(std::pair(prn_, observables_iter->second)); @@ -12677,8 +12677,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_CNAV_Ephemeris& e } for (observables_iter = observablesE5B.cbegin(); - observables_iter != observablesE5B.cend(); - observables_iter++) + observables_iter != observablesE5B.cend(); + observables_iter++) { const uint32_t prn_ = observables_iter->second.PRN; total_gal_map.insert(std::pair(prn_, observables_iter->second)); @@ -12690,8 +12690,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_CNAV_Ephemeris& e } for (observables_iter = observablesE6B.cbegin(); - observables_iter != observablesE6B.cend(); - observables_iter++) + observables_iter != observablesE6B.cend(); + observables_iter++) { const uint32_t prn_ = observables_iter->second.PRN; total_gal_map.insert(std::pair(prn_, observables_iter->second)); @@ -12703,8 +12703,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_CNAV_Ephemeris& e } for (observables_iter = observablesG2S.cbegin(); - observables_iter != observablesG2S.cend(); - observables_iter++) + observables_iter != observablesG2S.cend(); + observables_iter++) { const uint32_t prn_ = observables_iter->second.PRN; total_gps_map.insert(std::pair(prn_, observables_iter->second)); @@ -12716,8 +12716,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_CNAV_Ephemeris& e } for (observables_iter = observablesGL5.cbegin(); - observables_iter != observablesGL5.cend(); - observables_iter++) + observables_iter != observablesGL5.cend(); + observables_iter++) { const uint32_t prn_ = observables_iter->second.PRN; total_gps_map.insert(std::pair(prn_, observables_iter->second)); @@ -12746,8 +12746,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_CNAV_Ephemeris& e const auto satsys_gps = satelliteSystem.find("GPS"); std::pair::iterator, std::multimap::iterator> ret; for (it = available_gps_prns.cbegin(); - it != available_gps_prns.cend(); - it++) + it != available_gps_prns.cend(); + it++) { lineObs.clear(); if (satsys_gps != satelliteSystem.cend()) @@ -12812,8 +12812,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_CNAV_Ephemeris& e const auto satsys_gal = satelliteSystem.find("Galileo"); for (it = available_gal_prns.cbegin(); - it != available_gal_prns.cend(); - it++) + it != available_gal_prns.cend(); + it++) { lineObs.clear(); if (satsys_gal != satelliteSystem.cend()) @@ -12938,8 +12938,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& gps_ep std::map::const_iterator observables_iter; for (observables_iter = observables.cbegin(); - observables_iter != observables.cend(); - observables_iter++) + observables_iter != observables.cend(); + observables_iter++) { const std::string system_(&observables_iter->second.System, 1); const std::string sig_(observables_iter->second.Signal); @@ -12979,8 +12979,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& gps_ep std::set available_gps_prns; std::set::iterator it; for (observables_iter = observablesE1B.cbegin(); - observables_iter != observablesE1B.cend(); - observables_iter++) + observables_iter != observablesE1B.cend(); + observables_iter++) { const uint32_t prn_ = observables_iter->second.PRN; total_gal_map.insert(std::pair(prn_, observables_iter->second)); @@ -12992,8 +12992,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& gps_ep } for (observables_iter = observablesE5A.cbegin(); - observables_iter != observablesE5A.cend(); - observables_iter++) + observables_iter != observablesE5A.cend(); + observables_iter++) { const uint32_t prn_ = observables_iter->second.PRN; total_gal_map.insert(std::pair(prn_, observables_iter->second)); @@ -13005,8 +13005,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& gps_ep } for (observables_iter = observablesE5B.cbegin(); - observables_iter != observablesE5B.cend(); - observables_iter++) + observables_iter != observablesE5B.cend(); + observables_iter++) { const uint32_t prn_ = observables_iter->second.PRN; total_gal_map.insert(std::pair(prn_, observables_iter->second)); @@ -13018,8 +13018,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& gps_ep } for (observables_iter = observablesE6B.cbegin(); - observables_iter != observablesE6B.cend(); - observables_iter++) + observables_iter != observablesE6B.cend(); + observables_iter++) { const uint32_t prn_ = observables_iter->second.PRN; total_gal_map.insert(std::pair(prn_, observables_iter->second)); @@ -13031,8 +13031,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& gps_ep } for (observables_iter = observablesG1C.cbegin(); - observables_iter != observablesG1C.cend(); - observables_iter++) + observables_iter != observablesG1C.cend(); + observables_iter++) { const uint32_t prn_ = observables_iter->second.PRN; total_gps_map.insert(std::pair(prn_, observables_iter->second)); @@ -13044,8 +13044,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& gps_ep } for (observables_iter = observablesG2S.cbegin(); - observables_iter != observablesG2S.cend(); - observables_iter++) + observables_iter != observablesG2S.cend(); + observables_iter++) { const uint32_t prn_ = observables_iter->second.PRN; total_gps_map.insert(std::pair(prn_, observables_iter->second)); @@ -13057,8 +13057,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& gps_ep } for (observables_iter = observablesGL5.cbegin(); - observables_iter != observablesGL5.cend(); - observables_iter++) + observables_iter != observablesGL5.cend(); + observables_iter++) { const uint32_t prn_ = observables_iter->second.PRN; total_gps_map.insert(std::pair(prn_, observables_iter->second)); @@ -13087,8 +13087,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& gps_ep const auto satsys_gps = satelliteSystem.find("GPS"); std::pair::iterator, std::multimap::iterator> ret; for (it = available_gps_prns.cbegin(); - it != available_gps_prns.cend(); - it++) + it != available_gps_prns.cend(); + it++) { lineObs.clear(); if (satsys_gps != satelliteSystem.cend()) @@ -13164,8 +13164,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& gps_ep const auto satsys_gal = satelliteSystem.find("Galileo"); for (it = available_gal_prns.cbegin(); - it != available_gal_prns.cend(); - it++) + it != available_gal_prns.cend(); + it++) { lineObs.clear(); if (satsys_gal != satelliteSystem.cend()) @@ -13280,8 +13280,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Beidou_Dnav_Ephemeris std::map::const_iterator observables_iter; for (observables_iter = observables.cbegin(); - observables_iter != observables.cend(); - observables_iter++) + observables_iter != observables.cend(); + observables_iter++) { const std::string system_(&observables_iter->second.System, 1); const std::string sig_(observables_iter->second.Signal); @@ -13303,8 +13303,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Beidou_Dnav_Ephemeris if (found_B1 != std::string::npos) { for (observables_iter = observablesB1I.cbegin(); - observables_iter != observablesB1I.cend(); - observables_iter++) + observables_iter != observablesB1I.cend(); + observables_iter++) { const uint32_t prn_ = observables_iter->second.PRN; total_map.insert(std::pair(prn_, observables_iter->second)); @@ -13318,8 +13318,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Beidou_Dnav_Ephemeris if (found_B3 != std::string::npos) { for (observables_iter = observablesB3I.cbegin(); - observables_iter != observablesB3I.cend(); - observables_iter++) + observables_iter != observablesB3I.cend(); + observables_iter++) { const uint32_t prn_ = observables_iter->second.PRN; it = available_prns.find(prn_); @@ -13353,8 +13353,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Beidou_Dnav_Ephemeris const auto satsys_bds = satelliteSystem.find("Beidou"); std::pair::iterator, std::multimap::iterator> ret; for (it = available_prns.cbegin(); - it != available_prns.cend(); - it++) + it != available_prns.cend(); + it++) { lineObs.clear(); if (satsys_bds != satelliteSystem.cend()) diff --git a/src/algorithms/PVT/libs/rtcm.cc b/src/algorithms/PVT/libs/rtcm.cc index 5854b4eb8..0d9bc4b76 100644 --- a/src/algorithms/PVT/libs/rtcm.cc +++ b/src/algorithms/PVT/libs/rtcm.cc @@ -486,8 +486,8 @@ std::string Rtcm::print_MT1001(const Gps_Ephemeris& gps_eph, double obs_time, co std::map::const_iterator observables_iter; for (observables_iter = observables.cbegin(); - observables_iter != observables.cend(); - observables_iter++) + observables_iter != observables.cend(); + observables_iter++) { const std::string system_(&observables_iter->second.System, 1); const std::string sig_(observables_iter->second.Signal); @@ -501,8 +501,8 @@ std::string Rtcm::print_MT1001(const Gps_Ephemeris& gps_eph, double obs_time, co std::string data = header.to_string(); for (observables_iter = observablesL1.cbegin(); - observables_iter != observablesL1.cend(); - observables_iter++) + observables_iter != observablesL1.cend(); + observables_iter++) { const std::bitset<58> content = Rtcm::get_MT1001_sat_content(gps_eph, obs_time, observables_iter->second); data += content.to_string(); @@ -535,8 +535,8 @@ std::string Rtcm::print_MT1002(const Gps_Ephemeris& gps_eph, double obs_time, co std::map::const_iterator observables_iter; for (observables_iter = observables.cbegin(); - observables_iter != observables.cend(); - observables_iter++) + observables_iter != observables.cend(); + observables_iter++) { const std::string system_(&observables_iter->second.System, 1); const std::string sig_(observables_iter->second.Signal); @@ -550,8 +550,8 @@ std::string Rtcm::print_MT1002(const Gps_Ephemeris& gps_eph, double obs_time, co std::string data = header.to_string(); for (observables_iter = observablesL1.cbegin(); - observables_iter != observablesL1.cend(); - observables_iter++) + observables_iter != observablesL1.cend(); + observables_iter++) { const std::bitset<74> content = Rtcm::get_MT1002_sat_content(gps_eph, obs_time, observables_iter->second); data += content.to_string(); @@ -608,8 +608,8 @@ std::string Rtcm::print_MT1003(const Gps_Ephemeris& ephL1, const Gps_CNAV_Epheme std::map::const_iterator observables_iter2; for (observables_iter = observables.cbegin(); - observables_iter != observables.cend(); - observables_iter++) + observables_iter != observables.cend(); + observables_iter++) { const std::string system_(&observables_iter->second.System, 1); const std::string sig_(observables_iter->second.Signal); @@ -629,13 +629,13 @@ std::string Rtcm::print_MT1003(const Gps_Ephemeris& ephL1, const Gps_CNAV_Epheme std::map observablesL1_with_L2; for (observables_iter = observablesL1.cbegin(); - observables_iter != observablesL1.cend(); - observables_iter++) + observables_iter != observablesL1.cend(); + observables_iter++) { const uint32_t prn_ = observables_iter->second.PRN; for (observables_iter2 = observablesL2.cbegin(); - observables_iter2 != observablesL2.cend(); - observables_iter2++) + observables_iter2 != observablesL2.cend(); + observables_iter2++) { if (observables_iter2->second.PRN == prn_) { @@ -653,8 +653,8 @@ std::string Rtcm::print_MT1003(const Gps_Ephemeris& ephL1, const Gps_CNAV_Epheme std::string data = header.to_string(); for (common_observables_iter = common_observables.cbegin(); - common_observables_iter != common_observables.cend(); - common_observables_iter++) + common_observables_iter != common_observables.cend(); + common_observables_iter++) { std::bitset<101> content = Rtcm::get_MT1003_sat_content(ephL1, ephL2, obs_time, common_observables_iter->first, common_observables_iter->second); data += content.to_string(); @@ -717,8 +717,8 @@ std::string Rtcm::print_MT1004(const Gps_Ephemeris& ephL1, const Gps_CNAV_Epheme std::map::const_iterator observables_iter2; for (observables_iter = observables.cbegin(); - observables_iter != observables.cend(); - observables_iter++) + observables_iter != observables.cend(); + observables_iter++) { const std::string system_(&observables_iter->second.System, 1); const std::string sig_(observables_iter->second.Signal); @@ -738,13 +738,13 @@ std::string Rtcm::print_MT1004(const Gps_Ephemeris& ephL1, const Gps_CNAV_Epheme std::map observablesL1_with_L2; for (observables_iter = observablesL1.cbegin(); - observables_iter != observablesL1.cend(); - observables_iter++) + observables_iter != observablesL1.cend(); + observables_iter++) { const uint32_t prn_ = observables_iter->second.PRN; for (observables_iter2 = observablesL2.cbegin(); - observables_iter2 != observablesL2.cend(); - observables_iter2++) + observables_iter2 != observablesL2.cend(); + observables_iter2++) { if (observables_iter2->second.PRN == prn_) { @@ -762,8 +762,8 @@ std::string Rtcm::print_MT1004(const Gps_Ephemeris& ephL1, const Gps_CNAV_Epheme std::string data = header.to_string(); for (common_observables_iter = common_observables.cbegin(); - common_observables_iter != common_observables.cend(); - common_observables_iter++) + common_observables_iter != common_observables.cend(); + common_observables_iter++) { std::bitset<125> content = Rtcm::get_MT1004_sat_content(ephL1, ephL2, obs_time, common_observables_iter->first, common_observables_iter->second); data += content.to_string(); @@ -1164,8 +1164,8 @@ std::string Rtcm::print_MT1009(const Glonass_Gnav_Ephemeris& glonass_gnav_eph, d std::map::const_iterator observables_iter; for (observables_iter = observables.begin(); - observables_iter != observables.end(); - observables_iter++) + observables_iter != observables.end(); + observables_iter++) { const std::string system_(&observables_iter->second.System, 1); const std::string sig_(observables_iter->second.Signal); @@ -1179,8 +1179,8 @@ std::string Rtcm::print_MT1009(const Glonass_Gnav_Ephemeris& glonass_gnav_eph, d std::string data = header.to_string(); for (observables_iter = observablesL1.begin(); - observables_iter != observablesL1.end(); - observables_iter++) + observables_iter != observablesL1.end(); + observables_iter++) { const std::bitset<64> content = Rtcm::get_MT1009_sat_content(glonass_gnav_eph, obs_time, observables_iter->second); data += content.to_string(); @@ -1213,8 +1213,8 @@ std::string Rtcm::print_MT1010(const Glonass_Gnav_Ephemeris& glonass_gnav_eph, d std::map::const_iterator observables_iter; for (observables_iter = observables.begin(); - observables_iter != observables.end(); - observables_iter++) + observables_iter != observables.end(); + observables_iter++) { const std::string system_(&observables_iter->second.System, 1); const std::string sig_(observables_iter->second.Signal); @@ -1228,8 +1228,8 @@ std::string Rtcm::print_MT1010(const Glonass_Gnav_Ephemeris& glonass_gnav_eph, d std::string data = header.to_string(); for (observables_iter = observablesL1.begin(); - observables_iter != observablesL1.end(); - observables_iter++) + observables_iter != observablesL1.end(); + observables_iter++) { const std::bitset<79> content = Rtcm::get_MT1010_sat_content(glonass_gnav_eph, obs_time, observables_iter->second); data += content.to_string(); @@ -1290,8 +1290,8 @@ std::string Rtcm::print_MT1011(const Glonass_Gnav_Ephemeris& ephL1, const Glonas std::map::const_iterator observables_iter2; for (observables_iter = observables.begin(); - observables_iter != observables.end(); - observables_iter++) + observables_iter != observables.end(); + observables_iter++) { const std::string system_(&observables_iter->second.System, 1); const std::string sig_(observables_iter->second.Signal); @@ -1311,13 +1311,13 @@ std::string Rtcm::print_MT1011(const Glonass_Gnav_Ephemeris& ephL1, const Glonas std::map observablesL1_with_L2; for (observables_iter = observablesL1.begin(); - observables_iter != observablesL1.end(); - observables_iter++) + observables_iter != observablesL1.end(); + observables_iter++) { const uint32_t prn_ = observables_iter->second.PRN; for (observables_iter2 = observablesL2.begin(); - observables_iter2 != observablesL2.end(); - observables_iter2++) + observables_iter2 != observablesL2.end(); + observables_iter2++) { if (observables_iter2->second.PRN == prn_) { @@ -1335,8 +1335,8 @@ std::string Rtcm::print_MT1011(const Glonass_Gnav_Ephemeris& ephL1, const Glonas std::string data = header.to_string(); for (common_observables_iter = common_observables.begin(); - common_observables_iter != common_observables.end(); - common_observables_iter++) + common_observables_iter != common_observables.end(); + common_observables_iter++) { const std::bitset<107> content = Rtcm::get_MT1011_sat_content(ephL1, ephL2, obs_time, common_observables_iter->first, common_observables_iter->second); data += content.to_string(); @@ -1401,8 +1401,8 @@ std::string Rtcm::print_MT1012(const Glonass_Gnav_Ephemeris& ephL1, const Glonas std::map::const_iterator observables_iter2; for (observables_iter = observables.begin(); - observables_iter != observables.end(); - observables_iter++) + observables_iter != observables.end(); + observables_iter++) { const std::string system_(&observables_iter->second.System, 1); const std::string sig_(observables_iter->second.Signal); @@ -1422,13 +1422,13 @@ std::string Rtcm::print_MT1012(const Glonass_Gnav_Ephemeris& ephL1, const Glonas std::map observablesL1_with_L2; for (observables_iter = observablesL1.begin(); - observables_iter != observablesL1.end(); - observables_iter++) + observables_iter != observablesL1.end(); + observables_iter++) { const uint32_t prn_ = observables_iter->second.PRN; for (observables_iter2 = observablesL2.begin(); - observables_iter2 != observablesL2.end(); - observables_iter2++) + observables_iter2 != observablesL2.end(); + observables_iter2++) { if (observables_iter2->second.PRN == prn_) { @@ -1446,8 +1446,8 @@ std::string Rtcm::print_MT1012(const Glonass_Gnav_Ephemeris& ephL1, const Glonas std::string data = header.to_string(); for (common_observables_iter = common_observables.begin(); - common_observables_iter != common_observables.end(); - common_observables_iter++) + common_observables_iter != common_observables.end(); + common_observables_iter++) { const std::bitset<130> content = Rtcm::get_MT1012_sat_content(ephL1, ephL2, obs_time, common_observables_iter->first, common_observables_iter->second); data += content.to_string(); @@ -2387,8 +2387,8 @@ std::string Rtcm::get_MSM_1_content_sat_data(const std::map::iterator it; for (gnss_synchro_iter = observables.cbegin(); - gnss_synchro_iter != observables.cend(); - gnss_synchro_iter++) + gnss_synchro_iter != observables.cend(); + gnss_synchro_iter++) { it = std::find(pos.begin(), pos.end(), 65 - gnss_synchro_iter->second.PRN); if (it == pos.end()) @@ -2420,8 +2420,8 @@ std::string Rtcm::get_MSM_1_content_signal_data(const std::map::const_iterator map_iter; for (map_iter = observables.cbegin(); - map_iter != observables.cend(); - map_iter++) + map_iter != observables.cend(); + map_iter++) { observables_vector.emplace_back(*map_iter); } @@ -2529,8 +2529,8 @@ std::string Rtcm::get_MSM_2_content_signal_data(const Gps_Ephemeris& ephNAV, std::map::const_iterator map_iter; for (map_iter = observables.cbegin(); - map_iter != observables.cend(); - map_iter++) + map_iter != observables.cend(); + map_iter++) { observables_vector.emplace_back(*map_iter); } @@ -2644,8 +2644,8 @@ std::string Rtcm::get_MSM_3_content_signal_data(const Gps_Ephemeris& ephNAV, std::map::const_iterator map_iter; for (map_iter = observables.cbegin(); - map_iter != observables.cend(); - map_iter++) + map_iter != observables.cend(); + map_iter++) { observables_vector.emplace_back(*map_iter); } @@ -2759,8 +2759,8 @@ std::string Rtcm::get_MSM_4_content_sat_data(const std::map::iterator it; for (gnss_synchro_iter = observables.cbegin(); - gnss_synchro_iter != observables.cend(); - gnss_synchro_iter++) + gnss_synchro_iter != observables.cend(); + gnss_synchro_iter++) { it = std::find(pos.begin(), pos.end(), 65 - gnss_synchro_iter->second.PRN); if (it == pos.end()) @@ -2805,8 +2805,8 @@ std::string Rtcm::get_MSM_4_content_signal_data(const Gps_Ephemeris& ephNAV, std::map::const_iterator map_iter; for (map_iter = observables.cbegin(); - map_iter != observables.cend(); - map_iter++) + map_iter != observables.cend(); + map_iter++) { observables_vector.emplace_back(*map_iter); } @@ -2924,8 +2924,8 @@ std::string Rtcm::get_MSM_5_content_sat_data(const std::map::iterator it; for (gnss_synchro_iter = observables.cbegin(); - gnss_synchro_iter != observables.cend(); - gnss_synchro_iter++) + gnss_synchro_iter != observables.cend(); + gnss_synchro_iter++) { it = std::find(pos.begin(), pos.end(), 65 - gnss_synchro_iter->second.PRN); if (it == pos.end()) @@ -2975,8 +2975,8 @@ std::string Rtcm::get_MSM_5_content_signal_data(const Gps_Ephemeris& ephNAV, std::map::const_iterator map_iter; for (map_iter = observables.cbegin(); - map_iter != observables.cend(); - map_iter++) + map_iter != observables.cend(); + map_iter++) { observables_vector.emplace_back(*map_iter); } @@ -3097,8 +3097,8 @@ std::string Rtcm::get_MSM_6_content_signal_data(const Gps_Ephemeris& ephNAV, std::map::const_iterator map_iter; for (map_iter = observables.cbegin(); - map_iter != observables.cend(); - map_iter++) + map_iter != observables.cend(); + map_iter++) { observables_vector.emplace_back(*map_iter); } @@ -3218,8 +3218,8 @@ std::string Rtcm::get_MSM_7_content_signal_data(const Gps_Ephemeris& ephNAV, std::map::const_iterator map_iter; for (map_iter = observables.cbegin(); - map_iter != observables.cend(); - map_iter++) + map_iter != observables.cend(); + map_iter++) { observables_vector.emplace_back(*map_iter); } @@ -3881,8 +3881,8 @@ std::vector> Rtcm::sort_by_PRN_mask(const std:: } has_lower_pos; for (synchro_map_iter = synchro_map.cbegin(); - synchro_map_iter != synchro_map.cend(); - synchro_map_iter++) + synchro_map_iter != synchro_map.cend(); + synchro_map_iter++) { std::pair p(synchro_map_iter->first, synchro_map_iter->second); @@ -3939,8 +3939,8 @@ std::vector> Rtcm::sort_by_signal(const std::ve for (synchro_map_iter = synchro_map.cbegin(); - synchro_map_iter != synchro_map.cend(); - synchro_map_iter++) + synchro_map_iter != synchro_map.cend(); + synchro_map_iter++) { std::pair p(synchro_map_iter->first, synchro_map_iter->second); @@ -4346,8 +4346,8 @@ int32_t Rtcm::set_DF006(const std::map& observables) uint16_t nsats = 0; std::map::const_iterator observables_iter; for (observables_iter = observables.cbegin(); - observables_iter != observables.cend(); - observables_iter++) + observables_iter != observables.cend(); + observables_iter++) { nsats++; } @@ -4606,8 +4606,8 @@ int32_t Rtcm::set_DF035(const std::map& observables) uint16_t nsats = 0; std::map::const_iterator observables_iter; for (observables_iter = observables.begin(); - observables_iter != observables.end(); - observables_iter++) + observables_iter != observables.end(); + observables_iter++) { nsats++; } @@ -5674,8 +5674,8 @@ int32_t Rtcm::set_DF394(const std::map& gnss_synchro) std::map::const_iterator gnss_synchro_iter; uint32_t mask_position; for (gnss_synchro_iter = gnss_synchro.cbegin(); - gnss_synchro_iter != gnss_synchro.cend(); - gnss_synchro_iter++) + gnss_synchro_iter != gnss_synchro.cend(); + gnss_synchro_iter++) { mask_position = 64 - gnss_synchro_iter->second.PRN; DF394.set(mask_position, true); @@ -5695,8 +5695,8 @@ int32_t Rtcm::set_DF395(const std::map& gnss_synchro) std::string sig; uint32_t mask_position; for (gnss_synchro_iter = gnss_synchro.cbegin(); - gnss_synchro_iter != gnss_synchro.cend(); - gnss_synchro_iter++) + gnss_synchro_iter != gnss_synchro.cend(); + gnss_synchro_iter++) { const std::string sig_(gnss_synchro_iter->second.Signal); sig = sig_.substr(0, 2); @@ -5772,8 +5772,8 @@ std::string Rtcm::set_DF396(const std::map& observables) std::vector list_of_signals; for (observables_iter = observables.cbegin(); - observables_iter != observables.cend(); - observables_iter++) + observables_iter != observables.cend(); + observables_iter++) { list_of_sats.push_back(observables_iter->second.PRN); @@ -5826,8 +5826,8 @@ std::string Rtcm::set_DF396(const std::map& observables) { value = false; for (observables_iter = observables.cbegin(); - observables_iter != observables.cend(); - observables_iter++) + observables_iter != observables.cend(); + observables_iter++) { const std::string sig_(observables_iter->second.Signal); sig = sig_.substr(0, 2); diff --git a/src/algorithms/PVT/libs/rtklib_solver.cc b/src/algorithms/PVT/libs/rtklib_solver.cc index 35e4d3a9c..433819649 100644 --- a/src/algorithms/PVT/libs/rtklib_solver.cc +++ b/src/algorithms/PVT/libs/rtklib_solver.cc @@ -933,8 +933,8 @@ bool Rtklib_Solver::get_PVT(const std::map &gnss_observables_ bool band2 = false; for (gnss_observables_iter = gnss_observables_map.cbegin(); - gnss_observables_iter != gnss_observables_map.cend(); - ++gnss_observables_iter) + gnss_observables_iter != gnss_observables_map.cend(); + ++gnss_observables_iter) { switch (gnss_observables_iter->second.System) { @@ -962,8 +962,8 @@ bool Rtklib_Solver::get_PVT(const std::map &gnss_observables_ } for (gnss_observables_iter = gnss_observables_map.cbegin(); - gnss_observables_iter != gnss_observables_map.cend(); - ++gnss_observables_iter) // CHECK INCONSISTENCY when combining GLONASS + other system + gnss_observables_iter != gnss_observables_map.cend(); + ++gnss_observables_iter) // CHECK INCONSISTENCY when combining GLONASS + other system { switch (gnss_observables_iter->second.System) { diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.h index 7548d1274..9e29e67a8 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.h @@ -137,9 +137,9 @@ public: */ void stop_acquisition() override; - void set_state(int state __attribute__((unused))) override{}; + void set_state(int state __attribute__((unused))) override {}; - void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; + void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override {}; private: diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.h index b28d63422..cb90f39d5 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.h +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.h @@ -179,7 +179,7 @@ public: /*! * \brief Set resampler latency */ - void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; + void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override {}; private: static const uint32_t downsampling_factor_default = 4; diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.h index ee0e56abb..bcda0172f 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.h @@ -140,7 +140,7 @@ public: */ void stop_acquisition() override; - void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; + void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override {}; private: float calculate_threshold(float pfa); diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.h index 8eb96a5e0..9bfd524c2 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.h @@ -143,7 +143,7 @@ public: */ void stop_acquisition() override; - void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; + void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override {}; private: float calculate_threshold(float pfa) const; diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.h index 7d9245148..786723ea8 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.h @@ -143,7 +143,7 @@ public: */ void stop_acquisition() override; - void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; + void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override {}; private: float calculate_threshold(float pfa) const; diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.h b/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.h index 4a5655080..805799f49 100644 --- a/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.h +++ b/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.h @@ -145,7 +145,7 @@ public: */ void stop_acquisition() override; - void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; + void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override {}; private: float calculate_threshold(float pfa) const; diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.h b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.h index 14dae0230..ed3716155 100644 --- a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.h +++ b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.h @@ -186,7 +186,7 @@ public: /*! * \brief Set resampler latency */ - void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; + void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override {}; private: static const uint32_t downsampling_factor_default = 1; diff --git a/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition_fpga.h b/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition_fpga.h index d67bfd4a6..ce8e14e7b 100644 --- a/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition_fpga.h +++ b/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition_fpga.h @@ -185,7 +185,7 @@ public: /*! * \brief Set resampler latency */ - void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; + void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override {}; private: static const uint32_t downsampling_factor_default = 1; diff --git a/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.h b/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.h index 7a30d725d..533508fd7 100644 --- a/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.h @@ -147,7 +147,7 @@ public: */ void stop_acquisition() override; - void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; + void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override {}; private: pcps_acquisition_sptr acquisition_; diff --git a/src/algorithms/acquisition/adapters/glonass_l2_ca_pcps_acquisition.h b/src/algorithms/acquisition/adapters/glonass_l2_ca_pcps_acquisition.h index 5cce50b40..b8a6adf45 100644 --- a/src/algorithms/acquisition/adapters/glonass_l2_ca_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/glonass_l2_ca_pcps_acquisition.h @@ -146,7 +146,7 @@ public: */ void stop_acquisition() override; - void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; + void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override {}; private: pcps_acquisition_sptr acquisition_; diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.h index c5e27ece5..9288a1ce6 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.h @@ -142,7 +142,7 @@ public: */ void stop_acquisition() override; - void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; + void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override {}; private: pcps_acquisition_fine_doppler_cc_sptr acquisition_cc_; diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.h index 2b7bfd3f9..b8eadb373 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.h @@ -182,7 +182,7 @@ public: /*! * \brief Set Resampler Latency */ - void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; + void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override {}; private: static const uint32_t NUM_PRNs = 32; diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.h index 6a2cfde4c..e5acbed3f 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.h @@ -130,14 +130,14 @@ public: * \brief Restart acquisition algorithm */ void reset() override; - void set_state(int state __attribute__((unused))) override{}; + void set_state(int state __attribute__((unused))) override {}; /*! * \brief Stop running acquisition */ void stop_acquisition() override; - void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; + void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override {}; private: pcps_assisted_acquisition_cc_sptr acquisition_cc_; diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.h index 331f8c84b..084c0a5c4 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.h @@ -131,14 +131,14 @@ public: * \brief Restart acquisition algorithm */ void reset() override; - void set_state(int state __attribute__((unused))) override{}; + void set_state(int state __attribute__((unused))) override {}; /*! * \brief Stop running acquisition */ void stop_acquisition() override; - void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; + void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override {}; inline bool opencl_ready() const { diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.h index c148fa6c0..5ae294ae8 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.h @@ -145,7 +145,7 @@ public: */ void stop_acquisition() override; - void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; + void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override {}; private: float calculate_threshold(float pfa) const; diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.h index 336a1f1f9..8cba53e04 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.h @@ -143,7 +143,7 @@ public: */ void stop_acquisition() override; - void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; + void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override {}; private: float calculate_threshold(float pfa) const; diff --git a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.h b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.h index 81f4d342c..6ecc0ed41 100644 --- a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.h +++ b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.h @@ -147,7 +147,7 @@ public: */ void stop_acquisition() override; - void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; + void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override {}; private: static const uint32_t downsampling_factor_default = 1; diff --git a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.h b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.h index bf2bfafcf..1a41a35d8 100644 --- a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.h +++ b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.h @@ -182,7 +182,7 @@ public: /*! * \brief Set resampler latency */ - void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; + void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override {}; private: static const uint32_t NUM_PRNs = 32; diff --git a/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc index 24d8eee4e..b9e962959 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc @@ -243,8 +243,8 @@ void galileo_e5a_noncoherentIQ_acquisition_caf_cc::init() // Count the number of bins d_num_doppler_bins = 0; for (int doppler = -d_doppler_max; - doppler <= d_doppler_max; - doppler += d_doppler_step) + doppler <= d_doppler_max; + doppler += d_doppler_step) { d_num_doppler_bins++; } diff --git a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc index b5dc2b0ba..d684dd7da 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc @@ -161,8 +161,8 @@ void galileo_pcps_8ms_acquisition_cc::init() // Count the number of bins d_num_doppler_bins = 0; for (auto doppler = static_cast(-d_doppler_max); - doppler <= static_cast(d_doppler_max); - doppler += d_doppler_step) + doppler <= static_cast(d_doppler_max); + doppler += d_doppler_step) { d_num_doppler_bins++; } diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc index 3ad78883c..3e6860517 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc @@ -166,8 +166,8 @@ void pcps_cccwsr_acquisition_cc::init() // Count the number of bins d_num_doppler_bins = 0; for (auto doppler = static_cast(-d_doppler_max); - doppler <= static_cast(d_doppler_max); - doppler += d_doppler_step) + doppler <= static_cast(d_doppler_max); + doppler += d_doppler_step) { d_num_doppler_bins++; } diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc index fbd1b2052..7738a2b9e 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc @@ -269,8 +269,8 @@ void pcps_opencl_acquisition_cc::init() // Count the number of bins d_num_doppler_bins = 0; for (int doppler = static_cast(-d_doppler_max); - doppler <= static_cast(d_doppler_max); - doppler += d_doppler_step) + doppler <= static_cast(d_doppler_max); + doppler += d_doppler_step) { d_num_doppler_bins++; } diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc index d54b8085a..3fee0c12e 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc @@ -183,8 +183,8 @@ void pcps_quicksync_acquisition_cc::init() // Count the number of bins d_num_doppler_bins = 0; for (auto doppler = static_cast(-d_doppler_max); - doppler <= static_cast(d_doppler_max); - doppler += d_doppler_step) + doppler <= static_cast(d_doppler_max); + doppler += d_doppler_step) { d_num_doppler_bins++; } diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc index 75f8325d5..dcabf4e22 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc @@ -171,8 +171,8 @@ void pcps_tong_acquisition_cc::init() // Count the number of bins d_num_doppler_bins = 0; for (auto doppler = static_cast(-d_doppler_max); - doppler <= static_cast(d_doppler_max); - doppler += d_doppler_step) + doppler <= static_cast(d_doppler_max); + doppler += d_doppler_step) { d_num_doppler_bins++; } diff --git a/src/algorithms/libs/rtklib/rtklib_ppp.cc b/src/algorithms/libs/rtklib/rtklib_ppp.cc index ebd7ddc48..2310fcc6f 100644 --- a/src/algorithms/libs/rtklib/rtklib_ppp.cc +++ b/src/algorithms/libs/rtklib/rtklib_ppp.cc @@ -1727,34 +1727,34 @@ int res_ppp(int iter __attribute__((unused)), const obsd_t *obs, int n, const do if (opt->maxinno > 0.0 && fabs(v[nv]) > opt->maxinno && sys != SYS_GLO) { #endif - trace(2, "ppp outlier rejected %s sat=%2d type=%d v=%.3f\n", - time_str(obs[i].time, 0), sat, j, v[nv]); - rtk->ssat[sat - 1].rejc[0]++; - continue; + trace(2, "ppp outlier rejected %s sat=%2d type=%d v=%.3f\n", + time_str(obs[i].time, 0), sat, j, v[nv]); + rtk->ssat[sat - 1].rejc[0]++; + continue; + } + if (j == 0) + { + rtk->ssat[sat - 1].vsat[0] = 1; + } + nv++; } - if (j == 0) - { - rtk->ssat[sat - 1].vsat[0] = 1; - } - nv++; } -} -for (i = 0; i < nv; i++) - { - for (j = 0; j < nv; j++) - { - R[i + j * nv] = i == j ? var[i] : 0.0; - } - } -trace(5, "x=\n"); -tracemat(5, x, 1, nx, 8, 3); -trace(5, "v=\n"); -tracemat(5, v, 1, nv, 8, 3); -trace(5, "H=\n"); -tracemat(5, H, nx, nv, 8, 3); -trace(5, "R=\n"); -tracemat(5, R, nv, nv, 8, 5); -return nv; + for (i = 0; i < nv; i++) + { + for (j = 0; j < nv; j++) + { + R[i + j * nv] = i == j ? var[i] : 0.0; + } + } + trace(5, "x=\n"); + tracemat(5, x, 1, nx, 8, 3); + trace(5, "v=\n"); + tracemat(5, v, 1, nv, 8, 3); + trace(5, "H=\n"); + tracemat(5, H, nx, nv, 8, 3); + trace(5, "R=\n"); + tracemat(5, R, nv, nv, 8, 5); + return nv; } diff --git a/src/algorithms/libs/rtklib/rtklib_rtkcmn.cc b/src/algorithms/libs/rtklib/rtklib_rtkcmn.cc index 736928e51..5bc43b8e9 100644 --- a/src/algorithms/libs/rtklib/rtklib_rtkcmn.cc +++ b/src/algorithms/libs/rtklib/rtklib_rtkcmn.cc @@ -1777,9 +1777,7 @@ gtime_t timeget() { gtime_t time; double ep[6] = {}; - struct timeval tv - { - }; + struct timeval tv{}; struct tm *tt; if (!gettimeofday(&tv, nullptr) && (tt = gmtime(&tv.tv_sec))) diff --git a/src/algorithms/libs/rtklib/rtklib_stream.cc b/src/algorithms/libs/rtklib/rtklib_stream.cc index 3cb647ad6..f363525d6 100644 --- a/src/algorithms/libs/rtklib/rtklib_stream.cc +++ b/src/algorithms/libs/rtklib/rtklib_stream.cc @@ -87,9 +87,7 @@ serial_t *openserial(const char *path, int mode, char *msg) const speed_t bs[] = { B300, B600, B1200, B2400, B4800, B9600, B19200, B38400, B57600, B115200, B230400}; - struct termios ios - { - }; + struct termios ios{}; int rw = 0; tracet(3, "openserial: path=%s mode=%d\n", path, mode); @@ -1104,9 +1102,7 @@ void updatetcpsvr(tcpsvr_t *tcpsvr, char *msg) /* accept client connection --------------------------------------------------*/ int accsock(tcpsvr_t *tcpsvr, char *msg) { - struct sockaddr_in addr - { - }; + struct sockaddr_in addr{}; socket_t sock; socklen_t len = sizeof(addr); int i; diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_option_helpers.cc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_option_helpers.cc index f88da8bd7..9d6f16a7f 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_option_helpers.cc +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_option_helpers.cc @@ -111,8 +111,8 @@ void option_list::parse(int argc, char** argv) for (int arg_number = 0; arg_number < argc; ++arg_number) { for (std::vector::iterator this_option = d_internal_list.begin(); - this_option != d_internal_list.end(); - this_option++) + this_option != d_internal_list.end(); + this_option++) { int int_val = INT_MIN; if (this_option->longform == std::string(argv[arg_number]) || @@ -254,8 +254,8 @@ void option_list::help() std::cout << d_program_name << std::endl; std::cout << " -h [ --help ] \t\tdisplay this help message" << std::endl; for (std::vector::iterator this_option = d_internal_list.begin(); - this_option != d_internal_list.end(); - this_option++) + this_option != d_internal_list.end(); + this_option++) { std::string help_line(" "); if (this_option->shortform == "-") diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cpu_features/test/cpuinfo_aarch64_test.cc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cpu_features/test/cpuinfo_aarch64_test.cc index e69c5ef78..637cb676b 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cpu_features/test/cpuinfo_aarch64_test.cc +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cpu_features/test/cpuinfo_aarch64_test.cc @@ -137,7 +137,7 @@ TEST_F(CpuidAarch64Test, Aarch64FeaturesEnum) const char* last_name = GetAarch64FeaturesEnumName(AARCH64_LAST_); EXPECT_STREQ(last_name, "unknown_feature"); for (int i = static_cast(AARCH64_FP); - i != static_cast(AARCH64_LAST_); ++i) + i != static_cast(AARCH64_LAST_); ++i) { const auto feature = static_cast(i); const char* name = GetAarch64FeaturesEnumName(feature); diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.h index 1bfd1c991..766f24c0e 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.h @@ -70,7 +70,7 @@ private: public: // ctor volk_gnsssdr_test_params_t(float tol, lv_32fc_t scalar, unsigned int vlen, unsigned int iter, - bool benchmark_mode, std::string kernel_regex) : _tol(tol), _scalar(scalar), _vlen(vlen), _iter(iter), _benchmark_mode(benchmark_mode), _kernel_regex(std::move(kernel_regex)){}; + bool benchmark_mode, std::string kernel_regex) : _tol(tol), _scalar(scalar), _vlen(vlen), _iter(iter), _benchmark_mode(benchmark_mode), _kernel_regex(std::move(kernel_regex)) {}; // setters void set_tol(float tol) { _tol = tol; }; void set_scalar(lv_32fc_t scalar) { _scalar = scalar; }; @@ -104,10 +104,10 @@ public: volk_gnsssdr_test_params_t test_parameters() { return _test_parameters; }; // normal ctor volk_gnsssdr_test_case_t(volk_gnsssdr_func_desc_t desc, void (*kernel_ptr)(), std::string name, - volk_gnsssdr_test_params_t test_parameters) : _desc(desc), _kernel_ptr(kernel_ptr), _name(std::move(name)), _test_parameters(std::move(test_parameters)), _puppet_master_name("NULL"){}; + volk_gnsssdr_test_params_t test_parameters) : _desc(desc), _kernel_ptr(kernel_ptr), _name(std::move(name)), _test_parameters(std::move(test_parameters)), _puppet_master_name("NULL") {}; // ctor for puppets volk_gnsssdr_test_case_t(volk_gnsssdr_func_desc_t desc, void (*kernel_ptr)(), std::string name, - std::string puppet_master_name, volk_gnsssdr_test_params_t test_parameters) : _desc(desc), _kernel_ptr(kernel_ptr), _name(std::move(name)), _test_parameters(std::move(test_parameters)), _puppet_master_name(std::move(puppet_master_name)){}; + std::string puppet_master_name, volk_gnsssdr_test_params_t test_parameters) : _desc(desc), _kernel_ptr(kernel_ptr), _name(std::move(name)), _test_parameters(std::move(test_parameters)), _puppet_master_name(std::move(puppet_master_name)) {}; }; /************************************************ diff --git a/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.h b/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.h index a7d37b5a0..711632f21 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.h +++ b/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.h @@ -84,9 +84,7 @@ private: boost::thread *d_pcap_thread; // boost::mutex d_mutex; - struct sockaddr_in si_me - { - }; + struct sockaddr_in si_me{}; std::string d_src_device; std::string d_origin_address; pcap_t *descr; // ethernet pcap device descriptor diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.h index e6b22ba2a..df679916e 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.h +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.h @@ -62,7 +62,7 @@ public: ~glonass_l1_ca_telemetry_decoder_gs() override; //!< Class destructor void set_satellite(const Gnss_Satellite &satellite); //!< Set satellite PRN void set_channel(int32_t channel); //!< Set receiver's channel - inline void reset(){}; + inline void reset() {}; /*! * \brief This is where all signal processing takes place diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_gs.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_gs.h index fb3a93c38..3a0455d30 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_gs.h +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_gs.h @@ -60,7 +60,7 @@ public: ~glonass_l2_ca_telemetry_decoder_gs() override; //!< Class destructor void set_satellite(const Gnss_Satellite &satellite); //!< Set satellite PRN void set_channel(int32_t channel); //!< Set receiver's channel - inline void reset(){}; + inline void reset() {}; /*! * \brief This is where all signal processing takes place diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_gs.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_gs.h index 6e436b6b6..86fd2dfb6 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_gs.h +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_gs.h @@ -57,7 +57,7 @@ public: ~sbas_l1_telemetry_decoder_gs() override; void set_satellite(const Gnss_Satellite &satellite); //!< Set satellite PRN void set_channel(int32_t channel); //!< Set receiver's channel - inline void reset(){}; + inline void reset() {}; /*! * \brief This is where all signal processing takes place diff --git a/src/algorithms/telemetry_decoder/libs/viterbi_decoder_sbas.cc b/src/algorithms/telemetry_decoder/libs/viterbi_decoder_sbas.cc index 0eafce0f8..02c27e28b 100644 --- a/src/algorithms/telemetry_decoder/libs/viterbi_decoder_sbas.cc +++ b/src/algorithms/telemetry_decoder/libs/viterbi_decoder_sbas.cc @@ -277,7 +277,7 @@ int Viterbi_Decoder_Sbas::do_tb_and_decode(int traceback_length, int requested_d VLOG(BLOCK) << "overstep_length=" << overstep_length; for (it = d_trellis_paths.begin() + traceback_length; - it < d_trellis_paths.begin() + traceback_length + overstep_length; ++it) + it < d_trellis_paths.begin() + traceback_length + overstep_length; ++it) { state = it->get_anchestor_state_of_current_state(state); } diff --git a/src/algorithms/tracking/libs/cuda_multicorrelator.h b/src/algorithms/tracking/libs/cuda_multicorrelator.h index e23c698ef..561adf2df 100644 --- a/src/algorithms/tracking/libs/cuda_multicorrelator.h +++ b/src/algorithms/tracking/libs/cuda_multicorrelator.h @@ -46,7 +46,7 @@ struct GPU_Complex { float r; float i; - CUDA_CALLABLE_MEMBER_DEVICE GPU_Complex(){}; + CUDA_CALLABLE_MEMBER_DEVICE GPU_Complex() {}; CUDA_CALLABLE_MEMBER_DEVICE GPU_Complex(float a, float b) : r(a), i(b) {} CUDA_CALLABLE_MEMBER_DEVICE float magnitude2(void) { return r * r + i * i; } CUDA_CALLABLE_MEMBER_DEVICE GPU_Complex operator*(const GPU_Complex& a) diff --git a/src/algorithms/tracking/libs/nonlinear_tracking.h b/src/algorithms/tracking/libs/nonlinear_tracking.h index f00671f8d..f70b753a0 100644 --- a/src/algorithms/tracking/libs/nonlinear_tracking.h +++ b/src/algorithms/tracking/libs/nonlinear_tracking.h @@ -46,7 +46,7 @@ class ModelFunction { public: - ModelFunction(){}; + ModelFunction() {}; virtual arma::vec operator()(const arma::vec& input) = 0; virtual ~ModelFunction() = default; }; diff --git a/src/core/interfaces/gnss_block_interface.h b/src/core/interfaces/gnss_block_interface.h index 0a2de5d6e..4004752c7 100644 --- a/src/core/interfaces/gnss_block_interface.h +++ b/src/core/interfaces/gnss_block_interface.h @@ -83,7 +83,7 @@ public: assert(RF_channel >= 0); if (RF_channel == 0) { - }; // avoid unused param warning + }; // avoid unused param warning return nullptr; // added to support raw array access (non pure virtual to allow left unimplemented)= 0; } virtual gr::basic_block_sptr get_right_block(int RF_channel) @@ -91,14 +91,14 @@ public: assert(RF_channel >= 0); if (RF_channel == 0) { - }; // avoid unused param warning + }; // avoid unused param warning return nullptr; // added to support raw array access (non pure virtual to allow left unimplemented)= 0; } /*! * \brief Start the flow of samples if needed. */ - virtual void start(){}; + virtual void start() {}; }; diff --git a/src/core/libs/gnss_sdr_supl_client.cc b/src/core/libs/gnss_sdr_supl_client.cc index 86ec16658..a1f779e72 100644 --- a/src/core/libs/gnss_sdr_supl_client.cc +++ b/src/core/libs/gnss_sdr_supl_client.cc @@ -871,9 +871,9 @@ bool Gnss_Sdr_Supl_Client::read_gal_almanac_from_gsa(const std::string& file_nam return false; } for (pugi::xml_node almanac : doc.child("signalData") - .child("body") - .child("Almanacs") - .children("svAlmanac")) + .child("body") + .child("Almanacs") + .children("svAlmanac")) { Galileo_Almanac gal_alm; try diff --git a/src/core/libs/osnma_msg_receiver.cc b/src/core/libs/osnma_msg_receiver.cc index 1999a0cbb..7b9fae13d 100644 --- a/src/core/libs/osnma_msg_receiver.cc +++ b/src/core/libs/osnma_msg_receiver.cc @@ -206,7 +206,7 @@ void osnma_msg_receiver::msg_handler_osnma(const pmt::pmt_t& msg) } process_osnma_message(nma_msg); - } // OSNMA frame received + } // OSNMA frame received else if (msg_type_hash_code == typeid(std::shared_ptr>).hash_code()) // Navigation data bits for OSNMA received { const auto inav_data = wht::any_cast>>(pmt::any_ref(msg)); diff --git a/src/core/libs/supl/types/asn_internal.h b/src/core/libs/supl/types/asn_internal.h index 20edeab1a..8f921edd1 100644 --- a/src/core/libs/supl/types/asn_internal.h +++ b/src/core/libs/supl/types/asn_internal.h @@ -19,7 +19,7 @@ extern "C" { #endif -// clang-format off + // clang-format off /* Environment version might be used to avoid running with the old library */ #define ASN1C_ENVIRONMENT_VERSION 922 /* Compile-time version */ int get_asn1c_environment_version(void); /* Run-time version */ diff --git a/src/core/libs/supl/types/asn_system.h b/src/core/libs/supl/types/asn_system.h index 0b462b6eb..a6fa3ef8d 100644 --- a/src/core/libs/supl/types/asn_system.h +++ b/src/core/libs/supl/types/asn_system.h @@ -29,7 +29,7 @@ /* To avoid linking with ws2_32.lib, here's the definition of ntohl() */ #define sys_ntohl(l) \ ((((l) << 24) & 0xff000000) | (((l) << 16) & 0xff0000) | \ - (((l) << 8) & 0xff00) | ((l)&0xff)) + (((l) << 8) & 0xff00) | ((l) & 0xff)) #ifdef _MSC_VER /* MSVS.Net */ #ifndef __cplusplus diff --git a/src/core/libs/supl/types/ber_tlv_tag.h b/src/core/libs/supl/types/ber_tlv_tag.h index fc0208c3e..25614de23 100644 --- a/src/core/libs/supl/types/ber_tlv_tag.h +++ b/src/core/libs/supl/types/ber_tlv_tag.h @@ -22,7 +22,7 @@ extern "C" /* * Tag class is encoded together with tag value for optimization purposes. */ -#define BER_TAG_CLASS(tag) ((tag)&0x3) +#define BER_TAG_CLASS(tag) ((tag) & 0x3) #define BER_TAG_VALUE(tag) ((tag) >> 2) #define BER_TLV_CONSTRUCTED(tagptr) \ (((*(const uint8_t *)tagptr) & 0x20) ? 1 : 0) diff --git a/src/core/receiver/control_thread.cc b/src/core/receiver/control_thread.cc index 2e6231c91..9a265254d 100644 --- a/src/core/receiver/control_thread.cc +++ b/src/core/receiver/control_thread.cc @@ -244,9 +244,7 @@ void ControlThread::init() else { // fill agnss_ref_time_ - struct tm tm - { - }; + struct tm tm{}; if (strptime(ref_time_str.c_str(), "%d/%m/%Y %H:%M:%S", &tm) != nullptr) { agnss_ref_time_.seconds = timegm(&tm); @@ -560,8 +558,8 @@ bool ControlThread::read_assistance_from_XML() { std::map::const_iterator gps_eph_iter; for (gps_eph_iter = supl_client_ephemeris_.gps_ephemeris_map.cbegin(); - gps_eph_iter != supl_client_ephemeris_.gps_ephemeris_map.cend(); - gps_eph_iter++) + gps_eph_iter != supl_client_ephemeris_.gps_ephemeris_map.cend(); + gps_eph_iter++) { std::cout << "From XML file: Read NAV ephemeris for satellite " << Gnss_Satellite("GPS", gps_eph_iter->second.PRN) << '\n'; const std::shared_ptr tmp_obj = std::make_shared(gps_eph_iter->second); @@ -590,8 +588,8 @@ bool ControlThread::read_assistance_from_XML() { std::map::const_iterator gps_alm_iter; for (gps_alm_iter = supl_client_ephemeris_.gps_almanac_map.cbegin(); - gps_alm_iter != supl_client_ephemeris_.gps_almanac_map.cend(); - gps_alm_iter++) + gps_alm_iter != supl_client_ephemeris_.gps_almanac_map.cend(); + gps_alm_iter++) { std::cout << "From XML file: Read GPS almanac for satellite " << Gnss_Satellite("GPS", gps_alm_iter->second.PRN) << '\n'; const std::shared_ptr tmp_obj = std::make_shared(gps_alm_iter->second); @@ -608,8 +606,8 @@ bool ControlThread::read_assistance_from_XML() { std::map::const_iterator gal_eph_iter; for (gal_eph_iter = supl_client_ephemeris_.gal_ephemeris_map.cbegin(); - gal_eph_iter != supl_client_ephemeris_.gal_ephemeris_map.cend(); - gal_eph_iter++) + gal_eph_iter != supl_client_ephemeris_.gal_ephemeris_map.cend(); + gal_eph_iter++) { std::cout << "From XML file: Read ephemeris for satellite " << Gnss_Satellite("Galileo", gal_eph_iter->second.PRN) << '\n'; const std::shared_ptr tmp_obj = std::make_shared(gal_eph_iter->second); @@ -638,8 +636,8 @@ bool ControlThread::read_assistance_from_XML() { std::map::const_iterator gal_alm_iter; for (gal_alm_iter = supl_client_ephemeris_.gal_almanac_map.cbegin(); - gal_alm_iter != supl_client_ephemeris_.gal_almanac_map.cend(); - gal_alm_iter++) + gal_alm_iter != supl_client_ephemeris_.gal_almanac_map.cend(); + gal_alm_iter++) { std::cout << "From XML file: Read Galileo almanac for satellite " << Gnss_Satellite("Galileo", gal_alm_iter->second.PRN) << '\n'; const std::shared_ptr tmp_obj = std::make_shared(gal_alm_iter->second); @@ -655,8 +653,8 @@ bool ControlThread::read_assistance_from_XML() { std::map::const_iterator gps_cnav_eph_iter; for (gps_cnav_eph_iter = supl_client_ephemeris_.gps_cnav_ephemeris_map.cbegin(); - gps_cnav_eph_iter != supl_client_ephemeris_.gps_cnav_ephemeris_map.cend(); - gps_cnav_eph_iter++) + gps_cnav_eph_iter != supl_client_ephemeris_.gps_cnav_ephemeris_map.cend(); + gps_cnav_eph_iter++) { std::cout << "From XML file: Read CNAV ephemeris for satellite " << Gnss_Satellite("GPS", gps_cnav_eph_iter->second.PRN) << '\n'; const std::shared_ptr tmp_obj = std::make_shared(gps_cnav_eph_iter->second); @@ -680,8 +678,8 @@ bool ControlThread::read_assistance_from_XML() { std::map::const_iterator glo_gnav_eph_iter; for (glo_gnav_eph_iter = supl_client_ephemeris_.glonass_gnav_ephemeris_map.cbegin(); - glo_gnav_eph_iter != supl_client_ephemeris_.glonass_gnav_ephemeris_map.cend(); - glo_gnav_eph_iter++) + glo_gnav_eph_iter != supl_client_ephemeris_.glonass_gnav_ephemeris_map.cend(); + glo_gnav_eph_iter++) { std::cout << "From XML file: Read GLONASS GNAV ephemeris for satellite " << Gnss_Satellite("GLONASS", glo_gnav_eph_iter->second.PRN) << '\n'; const std::shared_ptr tmp_obj = std::make_shared(glo_gnav_eph_iter->second); @@ -809,8 +807,8 @@ void ControlThread::assist_GNSS() { std::map::const_iterator gps_eph_iter; for (gps_eph_iter = supl_client_ephemeris_.gps_ephemeris_map.cbegin(); - gps_eph_iter != supl_client_ephemeris_.gps_ephemeris_map.cend(); - gps_eph_iter++) + gps_eph_iter != supl_client_ephemeris_.gps_ephemeris_map.cend(); + gps_eph_iter++) { std::cout << "SUPL: Received ephemeris data for satellite " << Gnss_Satellite("GPS", gps_eph_iter->second.PRN) << '\n'; const std::shared_ptr tmp_obj = std::make_shared(gps_eph_iter->second); @@ -846,8 +844,8 @@ void ControlThread::assist_GNSS() { std::map::const_iterator gps_alm_iter; for (gps_alm_iter = supl_client_ephemeris_.gps_almanac_map.cbegin(); - gps_alm_iter != supl_client_ephemeris_.gps_almanac_map.cend(); - gps_alm_iter++) + gps_alm_iter != supl_client_ephemeris_.gps_almanac_map.cend(); + gps_alm_iter++) { std::cout << "SUPL: Received almanac data for satellite " << Gnss_Satellite("GPS", gps_alm_iter->second.PRN) << '\n'; const std::shared_ptr tmp_obj = std::make_shared(gps_alm_iter->second); @@ -900,8 +898,8 @@ void ControlThread::assist_GNSS() { std::map::const_iterator gps_acq_iter; for (gps_acq_iter = supl_client_acquisition_.gps_acq_map.cbegin(); - gps_acq_iter != supl_client_acquisition_.gps_acq_map.cend(); - gps_acq_iter++) + gps_acq_iter != supl_client_acquisition_.gps_acq_map.cend(); + gps_acq_iter++) { std::cout << "SUPL: Received acquisition assistance data for satellite " << Gnss_Satellite("GPS", gps_acq_iter->second.PRN) << '\n'; global_gps_acq_assist_map.write(gps_acq_iter->second.PRN, gps_acq_iter->second); @@ -1046,9 +1044,7 @@ std::vector> ControlThread::get_visible_sats(time std::vector visible_gps; std::vector visible_gal; const std::shared_ptr pvt_ptr = flowgraph_->get_pvt(); - struct tm tstruct - { - }; + struct tm tstruct{}; char buf[80]; tstruct = *gmtime(&rx_utc_time); strftime(buf, sizeof(buf), "%d/%m/%Y %H:%M:%S ", &tstruct); diff --git a/src/core/receiver/gnss_flowgraph.cc b/src/core/receiver/gnss_flowgraph.cc index 785672670..4ecbb3522 100644 --- a/src/core/receiver/gnss_flowgraph.cc +++ b/src/core/receiver/gnss_flowgraph.cc @@ -2485,8 +2485,8 @@ void GNSSFlowgraph::set_signals_list() { // Loop to create GPS L1 C/A signals for (available_gnss_prn_iter = available_gps_prn.cbegin(); - available_gnss_prn_iter != available_gps_prn.cend(); - available_gnss_prn_iter++) + available_gnss_prn_iter != available_gps_prn.cend(); + available_gnss_prn_iter++) { available_GPS_1C_signals_.emplace_back( Gnss_Satellite(std::string("GPS"), *available_gnss_prn_iter), @@ -2498,8 +2498,8 @@ void GNSSFlowgraph::set_signals_list() { // Loop to create GPS L2C M signals for (available_gnss_prn_iter = available_gps_prn.cbegin(); - available_gnss_prn_iter != available_gps_prn.cend(); - available_gnss_prn_iter++) + available_gnss_prn_iter != available_gps_prn.cend(); + available_gnss_prn_iter++) { available_GPS_2S_signals_.emplace_back( Gnss_Satellite(std::string("GPS"), *available_gnss_prn_iter), @@ -2511,8 +2511,8 @@ void GNSSFlowgraph::set_signals_list() { // Loop to create GPS L5 signals for (available_gnss_prn_iter = available_gps_prn.cbegin(); - available_gnss_prn_iter != available_gps_prn.cend(); - available_gnss_prn_iter++) + available_gnss_prn_iter != available_gps_prn.cend(); + available_gnss_prn_iter++) { available_GPS_L5_signals_.emplace_back( Gnss_Satellite(std::string("GPS"), *available_gnss_prn_iter), @@ -2524,8 +2524,8 @@ void GNSSFlowgraph::set_signals_list() { // Loop to create SBAS L1 C/A signals for (available_gnss_prn_iter = available_sbas_prn.cbegin(); - available_gnss_prn_iter != available_sbas_prn.cend(); - available_gnss_prn_iter++) + available_gnss_prn_iter != available_sbas_prn.cend(); + available_gnss_prn_iter++) { available_SBAS_1C_signals_.emplace_back( Gnss_Satellite(std::string("SBAS"), *available_gnss_prn_iter), @@ -2537,8 +2537,8 @@ void GNSSFlowgraph::set_signals_list() { // Loop to create the list of Galileo E1B signals for (available_gnss_prn_iter = available_galileo_prn.cbegin(); - available_gnss_prn_iter != available_galileo_prn.cend(); - available_gnss_prn_iter++) + available_gnss_prn_iter != available_galileo_prn.cend(); + available_gnss_prn_iter++) { available_GAL_1B_signals_.emplace_back( Gnss_Satellite(std::string("Galileo"), *available_gnss_prn_iter), @@ -2550,8 +2550,8 @@ void GNSSFlowgraph::set_signals_list() { // Loop to create the list of Galileo E5a signals for (available_gnss_prn_iter = available_galileo_prn.cbegin(); - available_gnss_prn_iter != available_galileo_prn.cend(); - available_gnss_prn_iter++) + available_gnss_prn_iter != available_galileo_prn.cend(); + available_gnss_prn_iter++) { available_GAL_5X_signals_.emplace_back( Gnss_Satellite(std::string("Galileo"), *available_gnss_prn_iter), @@ -2563,8 +2563,8 @@ void GNSSFlowgraph::set_signals_list() { // Loop to create the list of Galileo E5b signals for (available_gnss_prn_iter = available_galileo_prn.cbegin(); - available_gnss_prn_iter != available_galileo_prn.cend(); - available_gnss_prn_iter++) + available_gnss_prn_iter != available_galileo_prn.cend(); + available_gnss_prn_iter++) { available_GAL_7X_signals_.emplace_back( Gnss_Satellite(std::string("Galileo"), *available_gnss_prn_iter), @@ -2576,8 +2576,8 @@ void GNSSFlowgraph::set_signals_list() { // Loop to create the list of Galileo E6 signals for (available_gnss_prn_iter = available_galileo_prn.cbegin(); - available_gnss_prn_iter != available_galileo_prn.cend(); - available_gnss_prn_iter++) + available_gnss_prn_iter != available_galileo_prn.cend(); + available_gnss_prn_iter++) { available_GAL_E6_signals_.emplace_back( Gnss_Satellite(std::string("Galileo"), *available_gnss_prn_iter), @@ -2589,8 +2589,8 @@ void GNSSFlowgraph::set_signals_list() { // Loop to create the list of GLONASS L1 C/A signals for (available_gnss_prn_iter = available_glonass_prn.cbegin(); - available_gnss_prn_iter != available_glonass_prn.cend(); - available_gnss_prn_iter++) + available_gnss_prn_iter != available_glonass_prn.cend(); + available_gnss_prn_iter++) { available_GLO_1G_signals_.emplace_back( Gnss_Satellite(std::string("Glonass"), *available_gnss_prn_iter), @@ -2602,8 +2602,8 @@ void GNSSFlowgraph::set_signals_list() { // Loop to create the list of GLONASS L2 C/A signals for (available_gnss_prn_iter = available_glonass_prn.cbegin(); - available_gnss_prn_iter != available_glonass_prn.cend(); - available_gnss_prn_iter++) + available_gnss_prn_iter != available_glonass_prn.cend(); + available_gnss_prn_iter++) { available_GLO_2G_signals_.emplace_back( Gnss_Satellite(std::string("Glonass"), *available_gnss_prn_iter), @@ -2615,8 +2615,8 @@ void GNSSFlowgraph::set_signals_list() { // Loop to create the list of BeiDou B1C signals for (available_gnss_prn_iter = available_beidou_prn.cbegin(); - available_gnss_prn_iter != available_beidou_prn.cend(); - available_gnss_prn_iter++) + available_gnss_prn_iter != available_beidou_prn.cend(); + available_gnss_prn_iter++) { available_BDS_B1_signals_.emplace_back( Gnss_Satellite(std::string("Beidou"), *available_gnss_prn_iter), @@ -2628,8 +2628,8 @@ void GNSSFlowgraph::set_signals_list() { // Loop to create the list of BeiDou B1C signals for (available_gnss_prn_iter = available_beidou_prn.cbegin(); - available_gnss_prn_iter != available_beidou_prn.cend(); - available_gnss_prn_iter++) + available_gnss_prn_iter != available_beidou_prn.cend(); + available_gnss_prn_iter++) { available_BDS_B3_signals_.emplace_back( Gnss_Satellite(std::string("Beidou"), *available_gnss_prn_iter), diff --git a/src/core/receiver/tcp_cmd_interface.cc b/src/core/receiver/tcp_cmd_interface.cc index 587aa99fb..713c3e726 100644 --- a/src/core/receiver/tcp_cmd_interface.cc +++ b/src/core/receiver/tcp_cmd_interface.cc @@ -146,9 +146,7 @@ std::string TcpCmdInterface::status(const std::vector &commandLine &course_over_ground_deg, &UTC_time) == true) { - struct tm tstruct - { - }; + struct tm tstruct{}; std::array buf1{}; tstruct = *gmtime(&UTC_time); strftime(buf1.data(), buf1.size(), "%d/%m/%Y %H:%M:%S", &tstruct); @@ -179,9 +177,7 @@ std::string TcpCmdInterface::hotstart(const std::vector &commandLin if (commandLine.size() > 5) { // Read commandline time parameter - struct tm tm - { - }; + struct tm tm{}; const std::string tmp_str = commandLine.at(1) + commandLine.at(2); if (strptime(tmp_str.c_str(), "%d/%m/%Y %H:%M:%S", &tm) == nullptr) { @@ -227,9 +223,7 @@ std::string TcpCmdInterface::warmstart(const std::vector &commandLi if (commandLine.size() > 5) { // Read commandline time parameter - struct tm tm - { - }; + struct tm tm{}; const std::string tmp_str = commandLine.at(1) + commandLine.at(2); if (strptime(tmp_str.c_str(), "%d/%m/%Y %H:%M:%S", &tm) == nullptr) { diff --git a/src/core/system_parameters/GLONASS_L1_L2_CA.h b/src/core/system_parameters/GLONASS_L1_L2_CA.h index 042754742..0194e78db 100644 --- a/src/core/system_parameters/GLONASS_L1_L2_CA.h +++ b/src/core/system_parameters/GLONASS_L1_L2_CA.h @@ -87,10 +87,9 @@ constexpr int32_t GLONASS_CA_NBR_SATS = 24; // STRING DATA WITHOUT PREAMBLE constexpr int32_t GLONASS_L1_CA_HISTORY_DEEP = 100; // NAVIGATION MESSAGE DEMODULATION AND DECODING -#define GLONASS_GNAV_PREAMBLE \ - { \ - 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 1, 0 \ - } +#define GLONASS_GNAV_PREAMBLE \ + { \ + 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 1, 0} constexpr double GLONASS_GNAV_PREAMBLE_DURATION_S = 0.300; constexpr int32_t GLONASS_GNAV_PREAMBLE_LENGTH_BITS = 30; constexpr int32_t GLONASS_GNAV_PREAMBLE_LENGTH_SYMBOLS = 300; diff --git a/src/core/system_parameters/Galileo_OSNMA.h b/src/core/system_parameters/Galileo_OSNMA.h index b394781cd..2b9146cc0 100644 --- a/src/core/system_parameters/Galileo_OSNMA.h +++ b/src/core/system_parameters/Galileo_OSNMA.h @@ -173,7 +173,7 @@ public: const std::vector& s2_) : msg(msg_), nt(nt_), sequence1(s1_), - sequence2(s2_){}; + sequence2(s2_) {}; uint8_t msg{}; uint8_t nt{}; std::vector sequence1; diff --git a/src/core/system_parameters/galileo_inav_message.cc b/src/core/system_parameters/galileo_inav_message.cc index fc6945818..7f0ef6252 100644 --- a/src/core/system_parameters/galileo_inav_message.cc +++ b/src/core/system_parameters/galileo_inav_message.cc @@ -208,7 +208,7 @@ void Galileo_Inav_Message::split_page(std::string page_string, int32_t flag_even flag_CRC_test = false; } } // end of CRC checksum control - } // end if (page_string.at(0)=='1') + } // end if (page_string.at(0)=='1') else { page_Even = page_string.substr(0, 114); diff --git a/tests/common-files/gnuplot_i.h b/tests/common-files/gnuplot_i.h index 04b7e3458..783674802 100644 --- a/tests/common-files/gnuplot_i.h +++ b/tests/common-files/gnuplot_i.h @@ -2095,7 +2095,7 @@ inline bool Gnuplot::get_program_path() // scan list for Gnuplot program files for (std::list::const_iterator i = ls.begin(); - i != ls.end(); ++i) + i != ls.end(); ++i) { tmp = (*i) + "/" + Gnuplot::m_sGNUPlotFileName; #if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__TOS_WIN__) diff --git a/tests/system-tests/libs/spirent_motion_csv_dump_reader.cc b/tests/system-tests/libs/spirent_motion_csv_dump_reader.cc index dc88d9e7b..66a73d6df 100644 --- a/tests/system-tests/libs/spirent_motion_csv_dump_reader.cc +++ b/tests/system-tests/libs/spirent_motion_csv_dump_reader.cc @@ -97,7 +97,7 @@ bool Spirent_Motion_Csv_Dump_Reader::read_csv_obs() line, boost::escaped_list_separator('\\', ',', '\"')); for (boost::tokenizer>::iterator i( tk.begin()); - i != tk.end(); ++i) + i != tk.end(); ++i) { try { diff --git a/tests/unit-tests/arithmetic/fft_speed_test.cc b/tests/unit-tests/arithmetic/fft_speed_test.cc index 6c3d28690..e2282f2ed 100644 --- a/tests/unit-tests/arithmetic/fft_speed_test.cc +++ b/tests/unit-tests/arithmetic/fft_speed_test.cc @@ -37,8 +37,7 @@ TEST(FFTSpeedTest, ArmadilloVSGNURadioExecutionTime) unsigned int fft_sizes[19] = {16, 25, 32, 45, 64, 95, 128, 195, 256, 325, 512, 785, 1024, 1503, 2048, 3127, 4096, 6349, 8192}; double d_execution_time; EXPECT_NO_THROW( - for (unsigned int fft_size - : fft_sizes) { + for (unsigned int fft_size : fft_sizes) { d_fft_size = fft_size; auto d_gr_fft = gnss_fft_fwd_make_unique(d_fft_size); arma::arma_rng::set_seed_random(); diff --git a/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc b/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc index f7540e0c0..f66aeed57 100644 --- a/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc +++ b/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc @@ -1816,7 +1816,7 @@ bool HybridObservablesTest::ReadRinexObs(std::vector* obs_vec, Gnss_S } } } // end while - } // End of 'try' block + } // End of 'try' block catch (const gnsstk::FFStreamError& e) { std::cout << e; diff --git a/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test_fpga.cc b/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test_fpga.cc index c466a277b..f16c45004 100644 --- a/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test_fpga.cc +++ b/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test_fpga.cc @@ -1871,7 +1871,7 @@ bool HybridObservablesTestFpga::ReadRinexObs(std::vector* obs_vec, Gn } } } // end while - } // End of 'try' block + } // End of 'try' block catch (const gnsstk::FFStreamError& e) { diff --git a/tests/unit-tests/signal-processing-blocks/pvt/rtklib_solver_test.cc b/tests/unit-tests/signal-processing-blocks/pvt/rtklib_solver_test.cc index fe2aa27af..cebd4615c 100644 --- a/tests/unit-tests/signal-processing-blocks/pvt/rtklib_solver_test.cc +++ b/tests/unit-tests/signal-processing-blocks/pvt/rtklib_solver_test.cc @@ -398,8 +398,8 @@ TEST(RTKLibSolverTest, test1) { std::map::const_iterator gps_eph_iter; for (gps_eph_iter = supl_client_ephemeris_.gps_ephemeris_map.cbegin(); - gps_eph_iter != supl_client_ephemeris_.gps_ephemeris_map.cend(); - gps_eph_iter++) + gps_eph_iter != supl_client_ephemeris_.gps_ephemeris_map.cend(); + gps_eph_iter++) { std::cout << "SUPL: Read XML Ephemeris for GPS SV " << gps_eph_iter->first << '\n'; std::shared_ptr tmp_obj = std::make_shared(gps_eph_iter->second); diff --git a/tests/unit-tests/signal-processing-blocks/tracking/cubature_filter_test.cc b/tests/unit-tests/signal-processing-blocks/tracking/cubature_filter_test.cc index 2c78fa743..ff73bd1c4 100644 --- a/tests/unit-tests/signal-processing-blocks/tracking/cubature_filter_test.cc +++ b/tests/unit-tests/signal-processing-blocks/tracking/cubature_filter_test.cc @@ -25,7 +25,7 @@ class TransitionModel : public ModelFunction { public: - explicit TransitionModel(const arma::mat& kf_F) : coeff_mat(kf_F){}; + explicit TransitionModel(const arma::mat& kf_F) : coeff_mat(kf_F) {}; arma::vec operator()(const arma::vec& input) override { return coeff_mat * input; }; private: @@ -35,7 +35,7 @@ private: class MeasurementModel : public ModelFunction { public: - explicit MeasurementModel(const arma::mat& kf_H) : coeff_mat(kf_H){}; + explicit MeasurementModel(const arma::mat& kf_H) : coeff_mat(kf_H) {}; arma::vec operator()(const arma::vec& input) override { return coeff_mat * input; }; private: diff --git a/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc b/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc index d5a28ffa9..4241b7b6f 100644 --- a/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc +++ b/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc @@ -1282,8 +1282,8 @@ TEST_F(TrackingPullInTest, ValidationOfResults) } } } // end plot - } // end acquisition Delay errors loop - } // end acquisition Doppler errors loop + } // end acquisition Delay errors loop + } // end acquisition Doppler errors loop pull_in_results_v_v.push_back(pull_in_results_v); } // end CN0 LOOP diff --git a/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test_fpga.cc b/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test_fpga.cc index a2f27204e..351ef8e26 100644 --- a/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test_fpga.cc +++ b/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test_fpga.cc @@ -1433,8 +1433,8 @@ TEST_F(TrackingPullInTestFpga, ValidationOfResults) } } } // end plot - } // end acquisition Delay errors loop - } // end acquisition Doppler errors loop + } // end acquisition Delay errors loop + } // end acquisition Doppler errors loop pull_in_results_v_v.push_back(pull_in_results_v); } // end CN0 LOOP diff --git a/utils/front-end-cal/front_end_cal.cc b/utils/front-end-cal/front_end_cal.cc index dc26ab2a3..e74a8556e 100644 --- a/utils/front-end-cal/front_end_cal.cc +++ b/utils/front-end-cal/front_end_cal.cc @@ -56,8 +56,8 @@ bool FrontEndCal::read_assistance_from_XML() { std::map::iterator gps_eph_iter; for (gps_eph_iter = supl_client_ephemeris_.gps_ephemeris_map.begin(); - gps_eph_iter != supl_client_ephemeris_.gps_ephemeris_map.end(); - gps_eph_iter++) + gps_eph_iter != supl_client_ephemeris_.gps_ephemeris_map.end(); + gps_eph_iter++) { std::cout << "SUPL: Read XML Ephemeris for GPS SV " << gps_eph_iter->first << '\n'; LOG(INFO) << "SUPL: Read XML Ephemeris for GPS SV " << gps_eph_iter->first; @@ -134,8 +134,8 @@ int FrontEndCal::Get_SUPL_Assist() { std::map::iterator gps_eph_iter; for (gps_eph_iter = supl_client_ephemeris_.gps_ephemeris_map.begin(); - gps_eph_iter != supl_client_ephemeris_.gps_ephemeris_map.end(); - gps_eph_iter++) + gps_eph_iter != supl_client_ephemeris_.gps_ephemeris_map.end(); + gps_eph_iter++) { LOG(INFO) << "SUPL: Received Ephemeris for GPS SV " << gps_eph_iter->first; std::cout << "SUPL: Received Ephemeris for GPS SV " << gps_eph_iter->first << '\n'; @@ -163,8 +163,8 @@ int FrontEndCal::Get_SUPL_Assist() { std::map::iterator gps_alm_iter; for (gps_alm_iter = supl_client_ephemeris_.gps_almanac_map.begin(); - gps_alm_iter != supl_client_ephemeris_.gps_almanac_map.end(); - gps_alm_iter++) + gps_alm_iter != supl_client_ephemeris_.gps_almanac_map.end(); + gps_alm_iter++) { LOG(INFO) << "SUPL: Received Almanac for GPS SV " << gps_alm_iter->first; std::cout << "SUPL: Received Almanac for GPS SV " << gps_alm_iter->first << '\n'; @@ -199,8 +199,8 @@ int FrontEndCal::Get_SUPL_Assist() { std::map::iterator gps_acq_iter; for (gps_acq_iter = supl_client_acquisition_.gps_acq_map.begin(); - gps_acq_iter != supl_client_acquisition_.gps_acq_map.end(); - gps_acq_iter++) + gps_acq_iter != supl_client_acquisition_.gps_acq_map.end(); + gps_acq_iter++) { LOG(INFO) << "SUPL: Received Acquisition assistance for GPS SV " << gps_acq_iter->first; std::cout << "SUPL: Received Acquisition assistance for GPS SV " << gps_acq_iter->first << '\n'; diff --git a/utils/rinex-tools/obsdiff.cc b/utils/rinex-tools/obsdiff.cc index 1b2cd1fc3..d9f04d929 100644 --- a/utils/rinex-tools/obsdiff.cc +++ b/utils/rinex-tools/obsdiff.cc @@ -249,7 +249,7 @@ std::map ReadRinexObs(const std::string& rinex_file, char system } } } // end while - } // End of 'try' block + } // End of 'try' block catch (const gnsstk::FFStreamError& e) { std::cout << e; @@ -1408,8 +1408,8 @@ double compute_rx_clock_error(const std::string& rinex_nav_filename, const std:: rx_clock_error_s = raimSolver.Solution(3) / gnsstk::C_MPS; break; } // End of 'if( raimSolver.isValid() )' - } // End of 'if( rod.epochFlag == 0 || rod.epochFlag == 1 )' - } // End of 'while( roffs >> rod )' + } // End of 'if( rod.epochFlag == 0 || rod.epochFlag == 1 )' + } // End of 'while( roffs >> rod )' } catch (const gnsstk::FFStreamError& e) {