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

Remove global "using namespace std;" declarations, use "std::" prefixes on all std elements

Browse Source 
Fix whitespace changes
This commit is contained in:
Michael Sundqvist
2022-07-31 22:14:38 +02:00
committed by Martin Natano
parent f0680a29fc
commit 0cba3579de
534 changed files with 3456 additions and 3488 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/TimingData.h
+8 -8
View File
@@ -111,7 +111,7 @@ public:
};
// map can't be used for the lookup table because its find or *_bound
// functions would return the wrong entry.
// In a map<int, int> with three entries, [-1]= 3, [6]= 1, [8]= 2,
// In a std::map<int, int> with three entries, [-1]= 3, [6]= 1, [8]= 2,
// lower_bound(0) and upper_bound(0) both returned the entry at [6]= 1.
// So the lookup table is a vector of entries and FindEntryInLookup does a
// binary search.
@@ -122,7 +122,7 @@ public:
GetBeatStarts second;
lookup_item_t(float f, GetBeatStarts& s) :first(f), second(s) {}
};
typedef vector<lookup_item_t> beat_start_lookup_t;
typedef std::vector<lookup_item_t> beat_start_lookup_t;
beat_start_lookup_t m_beat_start_lookup;
beat_start_lookup_t m_time_start_lookup;
@@ -395,8 +395,8 @@ public:
{
FOREACH_ENUM( TimingSegmentType, tst )
{
const vector<TimingSegment*> &us = m_avpTimingSegments[tst];
const vector<TimingSegment*> &them = other.m_avpTimingSegments[tst];
const std::vector<TimingSegment*> &us = m_avpTimingSegments[tst];
const std::vector<TimingSegment*> &them = other.m_avpTimingSegments[tst];
// optimization: check vector sizes before contents
if( us.size() != them.size() )
@@ -431,11 +431,11 @@ public:
void SortSegments( TimingSegmentType tst );
const vector<TimingSegment*> &GetTimingSegments( TimingSegmentType tst ) const
const std::vector<TimingSegment*> &GetTimingSegments( TimingSegmentType tst ) const
{
return const_cast<TimingData *>(this)->GetTimingSegments(tst);
}
vector<TimingSegment *> &GetTimingSegments( TimingSegmentType tst )
std::vector<TimingSegment *> &GetTimingSegments( TimingSegmentType tst )
{
return m_avpTimingSegments[tst];
}
@@ -461,13 +461,13 @@ public:
float m_fBeat0OffsetInSeconds;
// XXX: this breaks encapsulation. get rid of it ASAP
vector<RString> ToVectorString(TimingSegmentType tst, int dec = 6) const;
std::vector<RString> ToVectorString(TimingSegmentType tst, int dec = 6) const;
protected:
// don't call this directly; use the derived-type overloads.
void AddSegment( const TimingSegment *seg );
// All of the following vectors must be sorted before gameplay.
std::array<vector<TimingSegment *>, NUM_TimingSegmentType> m_avpTimingSegments;
std::array<std::vector<TimingSegment *>, NUM_TimingSegmentType> m_avpTimingSegments;
};
#undef COMPARE