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

Silence warnings

pull/4/head
Paul Hollinsky 2018-09-18 17:01:37 -04:00
parent b254ac991d
commit 315be76034
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
platform/windows/pcap.cpp
View File

@ -149,9 +149,12 @@ std::vector<neodevice_t> PCAP::FindByProduct(int product) {
std::string serialFromMAC = GetEthDevSerialFromMacAddress(packet.srcMAC[3], ((packet.srcMAC[4] << 8) | packet.srcMAC[5])); std::string serialFromMAC = GetEthDevSerialFromMacAddress(packet.srcMAC[3], ((packet.srcMAC[4] << 8) | packet.srcMAC[5]));
neodevice_t neodevice; neodevice_t neodevice;
#pragma warning(push)
#pragma warning(disable:4996)
strncpy(neodevice.serial, serialFromMAC.c_str(), sizeof(neodevice.serial)); strncpy(neodevice.serial, serialFromMAC.c_str(), sizeof(neodevice.serial));
neodevice.serial[sizeof(neodevice.serial) - 1] = 0; neodevice.serial[sizeof(neodevice.serial) - 1] = 0;
neodevice.handle = (i << 24) | (packet.srcMAC[3] << 16) | (packet.srcMAC[4] << 8) | (packet.srcMAC[5]); #pragma warning(pop)
neodevice.handle = (neodevice_handle_t)((i << 24) | (packet.srcMAC[3] << 16) | (packet.srcMAC[4] << 8) | (packet.srcMAC[5]));
bool alreadyExists = false; bool alreadyExists = false;
for(auto& dev : foundDevices) for(auto& dev : foundDevices)
if(dev.handle == neodevice.handle) if(dev.handle == neodevice.handle)
@ -262,8 +265,6 @@ bool PCAP::close() {
} }
void PCAP::readTask() { void PCAP::readTask() {
constexpr size_t READ_BUFFER_SIZE = 10240;
uint8_t readbuf[READ_BUFFER_SIZE];
struct pcap_pkthdr* header; struct pcap_pkthdr* header;
const uint8_t* data; const uint8_t* data;
while(!closing) { while(!closing) {

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

@ -30,6 +30,10 @@
#pragma once #pragma once
#pragma warning(push)
#pragma warning(disable:4127) // ICS: Warnings generated by this file
#pragma warning(disable:4706)
#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
// Traits::index_t are set to < 32 bits, causing integer promotion, causing warnings // Traits::index_t are set to < 32 bits, causing integer promotion, causing warnings
@ -3633,3 +3637,5 @@ inline void swap(typename ConcurrentQueue<T, Traits>::ImplicitProducerKVP& a, ty
#if defined(__GNUC__) #if defined(__GNUC__)
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif #endif
#pragma warning(pop)