blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-31 12:10:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

General GCC compilation fixes

Browse source
This commit is contained in:
Dan Paulat 2023-04-17 18:37:23 -05:00
parent c7aba95233
commit 023688b746
19 changed files with 57 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

6
wxdata/source/scwx/wsr88d/rpg/digital_radial_data_array_packet.cpp
View file

@ -64,7 +64,7 @@ DigitalRadialDataArrayPacket::DigitalRadialDataArrayPacket() :
DigitalRadialDataArrayPacket::~DigitalRadialDataArrayPacket() = default;
DigitalRadialDataArrayPacket::DigitalRadialDataArrayPacket(
DigitalRadialDataArrayPacket&&) noexcept = default;
DigitalRadialDataArrayPacket&&) noexcept = default;
DigitalRadialDataArrayPacket& DigitalRadialDataArrayPacket::operator=(
DigitalRadialDataArrayPacket&&) noexcept = default;
@ -158,13 +158,13 @@ bool DigitalRadialDataArrayPacket::Parse(std::istream& is)
logger_->warn("Invalid packet code: {}", p->packetCode_);
blockValid = false;
}
if (p->indexOfFirstRangeBin_ < 0 || p->indexOfFirstRangeBin_ > 230)
if (p->indexOfFirstRangeBin_ > 230)
{
logger_->warn("Invalid index of first range bin: {}",
p->indexOfFirstRangeBin_);
blockValid = false;
}
if (p->numberOfRangeBins_ < 0 || p->numberOfRangeBins_ > 1840)
if (p->numberOfRangeBins_ > 1840)
{
logger_->warn("Invalid number of range bins: {}",
p->numberOfRangeBins_);

4
wxdata/source/scwx/wsr88d/rpg/vector_arrow_data_packet.cpp
View file

@ -102,11 +102,11 @@ bool VectorArrowDataPacket::Parse(std::istream& is)
// The number of vectors is equal to the size divided by the number of bytes
// in a vector
size_t vectorCount = p->lengthOfBlock_ / 10;
std::size_t vectorCount = p->lengthOfBlock_ / 10;
p->arrow_.resize(vectorCount);
for (int v = 0; v < vectorCount && !is.eof(); v++)
for (std::size_t v = 0; v < vectorCount && !is.eof(); v++)
{
VectorArrow& arrow = p->arrow_[v];

4
wxdata/source/scwx/wsr88d/rpg/wind_barb_data_packet.cpp
View file

@ -101,11 +101,11 @@ bool WindBarbDataPacket::Parse(std::istream& is)
// The number of vectors is equal to the size divided by the number of bytes
// in a vector
size_t vectorCount = p->lengthOfBlock_ / 10;
std::size_t vectorCount = p->lengthOfBlock_ / 10;
p->windBarb_.resize(vectorCount);
for (int v = 0; v < vectorCount && !is.eof(); v++)
for (std::size_t v = 0; v < vectorCount && !is.eof(); v++)
{
WindBarb& windBarb = p->windBarb_[v];