From 15a959591686303ba5ea714934b3f58a3e7dcc1c Mon Sep 17 00:00:00 2001 From: Mark Suder Date: Wed, 7 Jun 2023 14:52:41 -0400 Subject: [PATCH] https://github.com/nasa/nos3/issues/124 - Fix -Werror / -Wall errors. --- sim/inc/generic_eps_42_data_provider.hpp | 2 +- sim/inc/generic_eps_data_provider.hpp | 2 +- sim/src/generic_eps_data_point.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sim/inc/generic_eps_42_data_provider.hpp b/sim/inc/generic_eps_42_data_provider.hpp index 725eac3..8010595 100644 --- a/sim/inc/generic_eps_42_data_provider.hpp +++ b/sim/inc/generic_eps_42_data_provider.hpp @@ -21,7 +21,7 @@ namespace Nos3 private: /* Disallow these */ ~Generic_eps42DataProvider(void) {}; - Generic_eps42DataProvider& operator=(const Generic_eps42DataProvider&) {}; + Generic_eps42DataProvider& operator=(const Generic_eps42DataProvider&) {return *this;}; int16_t _sc; /* Which spacecraft number to parse out of 42 data */ }; diff --git a/sim/inc/generic_eps_data_provider.hpp b/sim/inc/generic_eps_data_provider.hpp index 5206d07..f8444a3 100644 --- a/sim/inc/generic_eps_data_provider.hpp +++ b/sim/inc/generic_eps_data_provider.hpp @@ -20,7 +20,7 @@ namespace Nos3 private: /* Disallow these */ ~Generic_epsDataProvider(void) {}; - Generic_epsDataProvider& operator=(const Generic_epsDataProvider&) {}; + Generic_epsDataProvider& operator=(const Generic_epsDataProvider&) {return *this;}; mutable double _request_count; }; diff --git a/sim/src/generic_eps_data_point.cpp b/sim/src/generic_eps_data_point.cpp index 4b8bf6b..92383c8 100644 --- a/sim/src/generic_eps_data_point.cpp +++ b/sim/src/generic_eps_data_point.cpp @@ -39,7 +39,7 @@ namespace Nos3 std::vector lines = dp->get_lines(); try { - for (int i = 0; i < lines.size(); i++) + for (unsigned int i = 0; i < lines.size(); i++) { /* Compare prefix */ if (lines[i].compare(0, MSsize, MatchString.str()) == 0)