Skip to content
Snippets Groups Projects
Commit 2b6a0367 authored by Joan Vallvé Navarro's avatar Joan Vallvé Navarro
Browse files

Merge branch 'devel' of

ssh://git@gitlab.iri.upc.edu:2202/mobile_robotics/gauss_project/gnss_utils.git
into devel

Conflicts:
	src/tdcp.cpp
parents c33c62d5 1d97dcf2
No related branches found
No related tags found
2 merge requests!20new tag,!19new tag
[submodule "deps/RTKLIB"]
path = deps/RTKLIB
url = ssh://git@gitlab.iri.upc.edu:2202/mobile_robotics/gauss_project/RTKLIB.git
branch = demo5
branch = devel
......@@ -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
......
......@@ -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:
......
......@@ -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());
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment