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

fixed build bugs

checksum-failure-logging
Zaid Nackasha 2019-06-03 17:18:02 -04:00
parent d49fba7d81
commit 3621184696
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,7 +84,7 @@ protected:
virtual void setupDecoder(Decoder& decoder) override { virtual void setupDecoder(Decoder& decoder) override {
Device::setupDecoder(decoder); Device::setupDecoder(decoder);
decoder.timestampMultiplier = 10; // Timestamps are in 10ns increments instead of the usual 25ns 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 {

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

@ -3640,4 +3640,6 @@ inline void swap(typename ConcurrentQueue<T, Traits>::ImplicitProducerKVP& a, ty
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif #endif
#if defined(_MSC_VAR)
#pragma warning(pop) #pragma warning(pop)
#endif

2
platform/posix/pcap.cpp
View File

@ -167,7 +167,7 @@ bool PCAP::IsHandleValid(neodevice_handle_t handle) {
return (netifIndex < knownInterfaces.size()); return (netifIndex < knownInterfaces.size());
} }
PCAP::PCAP(device_errorhandler_t err, neodevice_t& forDevice) : err(err), device(forDevice) { PCAP::PCAP(device_errorhandler_t err, neodevice_t& forDevice) : ICommunication(err), err(err), device(forDevice) {
if(IsHandleValid(device.handle)) { if(IsHandleValid(device.handle)) {
interface = knownInterfaces[(device.handle >> 24) & 0xFF]; interface = knownInterfaces[(device.handle >> 24) & 0xFF];
interface.fp = nullptr; // We're going to open our own connection to the interface. This should already be nullptr but just in case. interface.fp = nullptr; // We're going to open our own connection to the interface. This should already be nullptr but just in case.