Commit e43158f9 authored by loring's avatar loring

fix ambiguous else warnings


git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@26808 18c085ea-50e0-402c-830e-de6fd14e8384
parent 16316795
......@@ -331,7 +331,7 @@ size_t avtStateRecorderIntegralCurve::GetSampleStride() const
#define TEST_AND_INCREMENT( f, n ) \
if( historyMask & f ) \
stride += n;
{ stride += n; }
TEST_AND_INCREMENT( SAMPLE_TIME, 1 );
TEST_AND_INCREMENT( SAMPLE_POSITION, 3 );
......@@ -359,10 +359,12 @@ avtStateRecorderIntegralCurve::GetSampleIndex(const Attribute &attr) const
#define TEST_AND_INCREMENT(f, n) \
if (historyMask & f) \
{ \
if (f == attr) \
return idx; \
{ return idx; } \
else \
idx += n; \
{ idx += n; } \
}
TEST_AND_INCREMENT(SAMPLE_TIME, 1);
TEST_AND_INCREMENT(SAMPLE_POSITION, 3);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment