From d49fba7d812fda92085107c306a894223bed99ab Mon Sep 17 00:00:00 2001 From: Zaid Nackasha Date: Mon, 3 Jun 2019 12:43:28 -0400 Subject: [PATCH 1/3] Wrapped Visual Studio #Pragmas --- include/icsneo/third-party/concurrentqueue/concurrentqueue.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/icsneo/third-party/concurrentqueue/concurrentqueue.h b/include/icsneo/third-party/concurrentqueue/concurrentqueue.h index d5bbd7d..e4d934e 100644 --- a/include/icsneo/third-party/concurrentqueue/concurrentqueue.h +++ b/include/icsneo/third-party/concurrentqueue/concurrentqueue.h @@ -30,9 +30,11 @@ #pragma once +#ifdef _MSC_VER #pragma warning(push) #pragma warning(disable:4127) // ICS: Warnings generated by this file #pragma warning(disable:4706) +#endif #if defined(__GNUC__) // Disable -Wconversion warnings (spuriously triggered when Traits::size_t and From 3621184696efa953f8316c77cd6ca4887f1b4257 Mon Sep 17 00:00:00 2001 From: Zaid Nackasha Date: Mon, 3 Jun 2019 17:18:02 -0400 Subject: [PATCH 2/3] fixed build bugs --- include/icsneo/device/radpluto/radpluto.h | 2 +- include/icsneo/third-party/concurrentqueue/concurrentqueue.h | 4 +++- platform/posix/pcap.cpp | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) 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. From 8833617fe55217e99ffb01330a2fe1b971601c91 Mon Sep 17 00:00:00 2001 From: Jeffrey Quesnelle Date: Wed, 5 Jun 2019 13:08:02 -0400 Subject: [PATCH 3/3] fix wrong include path for radpluto on Windows --- include/icsneo/platform/windows/devices.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/icsneo/platform/windows/devices.h b/include/icsneo/platform/windows/devices.h index 34e460f..09e7a07 100644 --- a/include/icsneo/platform/windows/devices.h +++ b/include/icsneo/platform/windows/devices.h @@ -9,7 +9,7 @@ #include "icsneo/device/plasion/neoviion.h" #include "icsneo/device/plasion/neoviplasma.h" #include "icsneo/device/radgalaxy/radgalaxy.h" -#include "icsneo/device/radgalaxy/radpluto.h" +#include "icsneo/device/radpluto/radpluto.h" #include "icsneo/device/radstar2/radstar2eth.h" #include "icsneo/device/radstar2/radstar2usb.h" #include "icsneo/device/radsupermoon/radsupermoon.h"