diff --git a/include/icsneo/device/radpluto/radpluto.h b/include/icsneo/device/radpluto/radpluto.h index 618d1a2..5a51061 100644 --- a/include/icsneo/device/radpluto/radpluto.h +++ b/include/icsneo/device/radpluto/radpluto.h @@ -84,7 +84,7 @@ protected: virtual void setupDecoder(Decoder& decoder) override { 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& rxNetworks) override { diff --git a/include/icsneo/third-party/concurrentqueue/concurrentqueue.h b/include/icsneo/third-party/concurrentqueue/concurrentqueue.h index e4d934e..73ace63 100644 --- a/include/icsneo/third-party/concurrentqueue/concurrentqueue.h +++ b/include/icsneo/third-party/concurrentqueue/concurrentqueue.h @@ -3640,4 +3640,6 @@ inline void swap(typename ConcurrentQueue::ImplicitProducerKVP& a, ty #pragma GCC diagnostic pop #endif -#pragma warning(pop) \ No newline at end of file +#if defined(_MSC_VAR) +#pragma warning(pop) +#endif \ No newline at end of file diff --git a/platform/posix/pcap.cpp b/platform/posix/pcap.cpp index 5bd76af..c3edc30 100644 --- a/platform/posix/pcap.cpp +++ b/platform/posix/pcap.cpp @@ -167,7 +167,7 @@ bool PCAP::IsHandleValid(neodevice_handle_t handle) { 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)) { 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.