diff --git a/.gitmodules b/.gitmodules index 2999783577610c44e39242e31c38b22559de61b4..f4ff8e0be25812d7393a48625a4b6b1af2734a8b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "deps/RTKLIB"] path = deps/RTKLIB url = ssh://git@gitlab.iri.upc.edu:2202/mobile_robotics/gauss_project/RTKLIB.git - branch = demo5 + branch = devel diff --git a/include/gnss_utils/receivers/novatel_raw.h b/include/gnss_utils/receivers/novatel_raw.h index 5362ef28d3f2893b0f10276e32a05cf60de11b42..ddfd2bb9b37dbc98c6bfc438186ebf247fca7109 100644 --- a/include/gnss_utils/receivers/novatel_raw.h +++ b/include/gnss_utils/receivers/novatel_raw.h @@ -11,7 +11,7 @@ public: NovatelRaw(); ~NovatelRaw(); - RawDataType addDataStream(const std::vector<uint8_t>& data_stream); + RawDataType addDataStream(const std::vector<uint8_t>& data_stream) override; }; } // namespace GnssUtils diff --git a/include/gnss_utils/receivers/ublox_raw.h b/include/gnss_utils/receivers/ublox_raw.h index a1ba0c6a5f0ffc0849e8eb29b85080403e788a4f..a4b96fa72afa795ada35c050ba3ea90b82ab6d59 100644 --- a/include/gnss_utils/receivers/ublox_raw.h +++ b/include/gnss_utils/receivers/ublox_raw.h @@ -11,7 +11,7 @@ public: UBloxRaw(); ~UBloxRaw(); - RawDataType addDataStream(const std::vector<uint8_t>& data_stream); + RawDataType addDataStream(const std::vector<uint8_t>& data_stream) override; private: diff --git a/test/gtest/utils_gtest.h b/test/gtest/utils_gtest.h index 09c290758a8b953abc270a386ab4964075ebfdf8..2deddcb17755bb065887f55ce95ec6be4c8711e4 100644 --- a/test/gtest/utils_gtest.h +++ b/test/gtest/utils_gtest.h @@ -81,7 +81,7 @@ extern void ColoredPrintf(GTestColor color, const char* fmt, ...); class TestCout : public std::stringstream { public: - ~TestCout() + ~TestCout() override { PRINTF("%s\n", str().c_str()); }