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

Replace macro with for each loop.

Browse Source 
...again, blasted newlines.
This commit is contained in:
Jason Felds
2013-04-27 13:16:16 -04:00
parent 4427ea0d91
commit c89634d0d7
2 changed files with 231 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Foreach.h
-4
View File
@@ -22,10 +22,6 @@ for( set<elemType>::iterator var = (vect).begin(); var != (vect).end(); ++var )
#define FOREACHS_CONST( elemType, vect, var ) \ #define FOREACHS_CONST( elemType, vect, var ) \
for( set<elemType>::const_iterator var = (vect).begin(); var != (vect).end(); ++var ) for( set<elemType>::const_iterator var = (vect).begin(); var != (vect).end(); ++var )
/** @brief General foreach loop iterating over a list, using a constant iterator. */
#define FOREACHL_CONST( elemType, vect, var ) \
for( list<elemType>::const_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 )
src/RageSoundPosMap.cpp
+1 -3
View File
@@ -133,10 +133,8 @@ int64_t pos_map_queue::Search( int64_t iSourceFrame, bool *bApproximate ) const
* it maps to. */ * it maps to. */
int64_t iClosestPosition = 0, iClosestPositionDist = INT_MAX; int64_t iClosestPosition = 0, iClosestPositionDist = INT_MAX;
const pos_map_t *pClosestBlock = &*m_pImpl->m_Queue.begin(); /* print only */ const pos_map_t *pClosestBlock = &*m_pImpl->m_Queue.begin(); /* print only */
FOREACHL_CONST( pos_map_t, m_pImpl->m_Queue, it ) for (pos_map_t const &pm : m_pImpl->m_Queue)
{ {
const pos_map_t &pm = *it;
if( iSourceFrame >= pm.m_iSourceFrame && if( iSourceFrame >= pm.m_iSourceFrame &&
iSourceFrame < pm.m_iSourceFrame+pm.m_iFrames ) iSourceFrame < pm.m_iSourceFrame+pm.m_iFrames )
{ {