sven
/
libicsneo
mirror of https://github.com/intrepidcs/libicsneo.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge in fixes for warnings

checksum-failure-logging
Paul Hollinsky 2019-06-12 18:36:35 -04:00
parent 9175a7bacf 8833617fe5
commit 4530bd14c0
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/icsneo/device/radpluto/radpluto.h
View File

@ -44,6 +44,11 @@ protected:
encoder.supportCANFD = true; encoder.supportCANFD = true;
} }
virtual void setupDecoder(Decoder& decoder) override {
Device::setupDecoder(decoder);
decoder.timestampResolution = 10; // Timestamps are in 10ns increments instead of the usual 25ns
}
virtual void setupSupportedRXNetworks(std::vector<Network>& rxNetworks) override { virtual void setupSupportedRXNetworks(std::vector<Network>& rxNetworks) override {
for(auto& netid : GetSupportedNetworks()) for(auto& netid : GetSupportedNetworks())
rxNetworks.emplace_back(netid); rxNetworks.emplace_back(netid);

6
include/icsneo/third-party/concurrentqueue/concurrentqueue.h vendored
View File

@ -30,9 +30,11 @@
#pragma once #pragma once
#ifdef _MSC_VER
#pragma warning(push) #pragma warning(push)
#pragma warning(disable:4127) // ICS: Warnings generated by this file #pragma warning(disable:4127) // ICS: Warnings generated by this file
#pragma warning(disable:4706) #pragma warning(disable:4706)
#endif
#if defined(__GNUC__) #if defined(__GNUC__)
// Disable -Wconversion warnings (spuriously triggered when Traits::size_t and // Disable -Wconversion warnings (spuriously triggered when Traits::size_t and
@ -3638,4 +3640,6 @@ inline void swap(typename ConcurrentQueue<T, Traits>::ImplicitProducerKVP& a, ty
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif #endif
#pragma warning(pop) #if defined(_MSC_VAR)
#pragma warning(pop)
#endif