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

Simple merge for once.

Browse Source
This commit is contained in:
Jason Felds
2013-04-23 21:21:25 -04:00
parent 6761a3f33a b59d3e9a8f
commit ef9c5294a0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/TimingData.cpp
+2 -2
View File
@@ -342,9 +342,9 @@ const TimingSegment* TimingData::GetSegmentAtRow( int iNoteRow, TimingSegmentTyp
FAIL_M("Could not find timing segment for row");
}
TimingSegment* GetSegmentAtRow( int iNoteRow, TimingSegmentType tst )
TimingSegment* TimingData::GetSegmentAtRow( int iNoteRow, TimingSegmentType tst )
{
return const_cast<TimingSegment*>( GetSegmentAtRow(iNoteRow, tst) );
return const_cast<TimingSegment*>( static_cast<const TimingData*>(this)->GetSegmentAtRow(iNoteRow, tst) );
}
static void EraseSegment( vector<TimingSegment*> &vSegs, int index, TimingSegment *cur )