actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Decouple <cstddef>

Browse Source
This commit is contained in:
Martin Natano
2023-04-20 11:21:29 +02:00
parent 093675cdc3
commit 78fb2e9fc3
171 changed files with 2012 additions and 1786 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/TimingData.cpp
+13 -12
View File
@@ -9,6 +9,7 @@
#include <cfloat>
#include <cmath>
#include <cstddef>
static void EraseSegment(std::vector<TimingSegment*> &vSegs, int index, TimingSegment *cur);
static const int INVALID_INDEX = -1;
@@ -64,7 +65,7 @@ bool TimingData::IsSafeFullTiming()
needed_segments.push_back(SEGMENT_SPEED);
needed_segments.push_back(SEGMENT_SCROLL);
}
for(size_t s= 0; s < needed_segments.size(); ++s)
for(std::size_t s= 0; s < needed_segments.size(); ++s)
{
if(m_avpTimingSegments[needed_segments[s]].empty())
{
@@ -151,7 +152,7 @@ void TimingData::DumpOneTable(const beat_start_lookup_t& lookup, const RString&
const std::vector<TimingSegment*>& stops= m_avpTimingSegments[SEGMENT_STOP];
const std::vector<TimingSegment*>& delays= m_avpTimingSegments[SEGMENT_DELAY];
LOG->Trace("%s lookup table:", name.c_str());
for(size_t lit= 0; lit < lookup.size(); ++lit)
for(std::size_t lit= 0; lit < lookup.size(); ++lit)
{
const lookup_item_t& item= lookup[lit];
const GetBeatStarts& starts= item.second;
@@ -183,8 +184,8 @@ TimingData::beat_start_lookup_t::const_iterator FindEntryInLookup(
{
return lookup.end();
}
size_t lower= 0;
size_t upper= lookup.size()-1;
std::size_t lower= 0;
std::size_t upper= lookup.size()-1;
if(lookup[lower].first > entry)
{
return lookup.end();
@@ -196,7 +197,7 @@ TimingData::beat_start_lookup_t::const_iterator FindEntryInLookup(
}
while(upper - lower > 1)
{
size_t next= (upper + lower) / 2;
std::size_t next= (upper + lower) / 2;
if(lookup[next].first > entry)
{
upper= next;
@@ -240,7 +241,7 @@ void TimingData::CopyRange(int start_row, int end_row,
if(seg_type == copy_type || copy_type == TimingSegmentType_Invalid)
{
const std::vector<TimingSegment*>& segs= GetTimingSegments(seg_type);
for(size_t i= 0; i < segs.size(); ++i)
for(std::size_t i= 0; i < segs.size(); ++i)
{
if(segs[i]->GetRow() >= start_row && segs[i]->GetRow() <= end_row)
{
@@ -276,7 +277,7 @@ void TimingData::ShiftRange(int start_row, int end_row,
// the rows of the segments, the second time removing segments that
// have been run over by a segment being moved. Attempts to combine
// both operations into a single loop were error prone. -Kyz
for(size_t i= first_affected; i <= static_cast<size_t>(last_affected) && i < segs.size(); ++i)
for(std::size_t i= first_affected; i <= static_cast<std::size_t>(last_affected) && i < segs.size(); ++i)
{
int seg_row= segs[i]->GetRow();
if(seg_row > 0 && seg_row >= start_row && seg_row <= end_row)
@@ -286,7 +287,7 @@ void TimingData::ShiftRange(int start_row, int end_row,
}
}
#define ERASE_SEG(s) if(segs.size() > 1) { EraseSegment(segs, s, segs[s]); --i; --last_affected; erased= true; }
for(size_t i= first_affected; i <= static_cast<size_t>(last_affected) && i < segs.size(); ++i)
for(std::size_t i= first_affected; i <= static_cast<std::size_t>(last_affected) && i < segs.size(); ++i)
{
bool erased= false;
int seg_row= segs[i]->GetRow();
@@ -652,7 +653,7 @@ void TimingData::AddSegment( const TimingSegment *seg )
// and adding the new segment.
// If the new segment is also redundant, erase the next segment because
// that effectively moves it back to the prev segment. -Kyz
if(static_cast<size_t>(index) < vSegs.size() - 1)
if(static_cast<std::size_t>(index) < vSegs.size() - 1)
{
TimingSegment* next= vSegs[index + 1];
if((*seg) == (*next))
@@ -1308,7 +1309,7 @@ void TimingSegmentSetToLuaTable(TimingData* td, TimingSegmentType tst, lua_State
lua_createtable(L, segs.size(), 0);
if(tst == SEGMENT_LABEL)
{
for(size_t i= 0; i < segs.size(); ++i)
for(std::size_t i= 0; i < segs.size(); ++i)
{
lua_createtable(L, 2, 0);
lua_pushnumber(L, segs[i]->GetBeat());
@@ -1320,13 +1321,13 @@ void TimingSegmentSetToLuaTable(TimingData* td, TimingSegmentType tst, lua_State
}
else
{
for(size_t i= 0; i < segs.size(); ++i)
for(std::size_t i= 0; i < segs.size(); ++i)
{
std::vector<float> values= segs[i]->GetValues();
lua_createtable(L, values.size()+1, 0);
lua_pushnumber(L, segs[i]->GetBeat());
lua_rawseti(L, -2, 1);
for(size_t v= 0; v < values.size(); ++v)
for(std::size_t v= 0; v < values.size(); ++v)
{
lua_pushnumber(L, values[v]);
lua_rawseti(L, -2, v+2);