Fix minor windows pedantic warnings.

This commit is contained in:
Jason Felds
2016-03-27 21:52:05 -04:00
parent 534909d30a
commit bec18a0d36
31 changed files with 173 additions and 67 deletions
+8 -3
View File
@@ -70,19 +70,22 @@ static void LoadFromSMNoteDataStringWithPlayer( NoteData& out, const RString &sS
* would do as I would expect. */
split( sSMNoteData, ",", start, size, end, true ); // Ignore empty is important.
if( start == end )
{
break;
}
// Partial string split.
int measureLineStart = start, measureLineSize = -1;
const int measureEnd = start + size;
aMeasureLines.clear();
while( true )
for(;;)
{
// Ignore empty is clearly important here.
split( sSMNoteData, "\n", measureLineStart, measureLineSize, measureEnd, true );
if( measureLineStart == measureEnd )
{
break;
}
//RString &line = sSMNoteData.substr( measureLineStart, measureLineSize );
const char *beginLine = sSMNoteData.data() + measureLineStart;
const char *endLine = beginLine + measureLineSize;
@@ -706,11 +709,13 @@ void LightTransformHelper( const NoteData &in, NoteData &out, const vector<int>
* until we've extended to the end of the latest overlapping hold note. */
int iHoldStart = r;
int iHoldEnd = -1;
while(1)
for(;;)
{
int iMaxTailRow = FindLongestOverlappingHoldNoteForAnyTrack( in, r );
if( iMaxTailRow == -1 )
{
break;
}
iHoldEnd = iMaxTailRow;
r = iMaxTailRow;
}