From 4d074f3b81c55de3c7b37e58fb66e23b57858bf1 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Mon, 14 Mar 2011 01:21:30 -0400 Subject: [PATCH] Fix g++ warnings. --- src/TimingData.cpp | 4 ++-- src/TimingData.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/TimingData.cpp b/src/TimingData.cpp index 3e03b64351..5959ef36fe 100644 --- a/src/TimingData.cpp +++ b/src/TimingData.cpp @@ -572,8 +572,8 @@ float TimingData::GetElapsedTimeFromBeatNoOffset( float fBeat ) const /* A traditional stop has the beat happening before the stop (>=) * A Pump delay acts differently. [aj: how?] (>) */ - if( m_StopSegments[j].m_iStartRow >= iRow && !m_StopSegments[j].m_bDelay || - m_StopSegments[j].m_iStartRow > iRow && m_StopSegments[j].m_bDelay ) + if( ( m_StopSegments[j].m_iStartRow >= iRow && !m_StopSegments[j].m_bDelay ) || + ( m_StopSegments[j].m_iStartRow > iRow && m_StopSegments[j].m_bDelay ) ) break; fElapsedTime += m_StopSegments[j].m_fStopSeconds; } diff --git a/src/TimingData.h b/src/TimingData.h index afbe71d3e1..4ae8c8b50c 100644 --- a/src/TimingData.h +++ b/src/TimingData.h @@ -174,7 +174,7 @@ struct StopSegment { return ( m_iStartRow < other.m_iStartRow ) || ( m_iStartRow == other.m_iStartRow && - ( m_bDelay && !other.m_bDelay || m_fStopSeconds < other.m_fStopSeconds )); + ( ( m_bDelay && !other.m_bDelay ) || m_fStopSeconds < other.m_fStopSeconds )); } /** * @brief Compares two StopSegments to see if one is less than or equal to the other.