All set loops handled.

This commit is contained in:
Jason Felds
2013-04-27 14:02:11 -04:00
parent dfe924a64d
commit 7e5bc7aa89
3 changed files with 2984 additions and 2988 deletions
-4
View File
@@ -8,10 +8,6 @@ for( vector<elemType>::iterator var = (vect).begin(); var != (vect).end(); ++var
#define FOREACH_CONST( elemType, vect, var ) \ #define FOREACH_CONST( elemType, vect, var ) \
for( vector<elemType>::const_iterator var = (vect).begin(); var != (vect).end(); ++var ) for( vector<elemType>::const_iterator var = (vect).begin(); var != (vect).end(); ++var )
/** @brief General foreach loop iterating over a set. */
#define FOREACHS( elemType, vect, var ) \
for( set<elemType>::iterator var = (vect).begin(); var != (vect).end(); ++var )
/** @brief General foreach loop iterating over a map. */ /** @brief General foreach loop iterating over a map. */
#define FOREACHM( keyType, valType, vect, var ) \ #define FOREACHM( keyType, valType, vect, var ) \
for( map<keyType, valType>::iterator var = (vect).begin(); var != (vect).end(); ++var ) for( map<keyType, valType>::iterator var = (vect).begin(); var != (vect).end(); ++var )
+2 -2
View File
@@ -1046,8 +1046,8 @@ public:
static void InvalidateObjects() static void InvalidateObjects()
{ {
FOREACHS( InvalidateObject*, g_InvalidateList, it ) for (InvalidateObject *it : g_InvalidateList)
(*it)->Invalidate(); it->Invalidate();
} }
class RageCompiledGeometryHWOGL : public RageCompiledGeometrySWOGL, public InvalidateObject class RageCompiledGeometryHWOGL : public RageCompiledGeometrySWOGL, public InvalidateObject
+3 -3
View File
@@ -183,10 +183,10 @@ int RageSoundSplitterImpl::ReadBuffer()
/* Discard any bytes that are no longer requested by any sound. */ /* Discard any bytes that are no longer requested by any sound. */
int iMinFrameRequested = INT_MAX; int iMinFrameRequested = INT_MAX;
int iMaxFrameRequested = INT_MIN; int iMaxFrameRequested = INT_MIN;
FOREACHS( RageSoundReader_Split *, m_apSounds, snd ) for (RageSoundReader_Split *snd : m_apSounds)
{ {
iMinFrameRequested = min( iMinFrameRequested, (*snd)->m_iPositionFrame ); iMinFrameRequested = min( iMinFrameRequested, snd->m_iPositionFrame );
iMaxFrameRequested = max( iMaxFrameRequested, (*snd)->m_iPositionFrame + (*snd)->m_iRequestFrames ); iMaxFrameRequested = max( iMaxFrameRequested, snd->m_iPositionFrame + snd->m_iRequestFrames );
} }
if( iMinFrameRequested > m_iBufferPositionFrames ) if( iMinFrameRequested > m_iBufferPositionFrames )