summaryrefslogtreecommitdiff
path: root/indra/llcommon/tests
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2017-05-18 03:13:57 +0300
committerAndreyL ProductEngine <alihatskiy@productengine.com>2017-05-18 03:13:57 +0300
commit4a90678cc7406b0c2c8dad5691cdc2555186931b (patch)
tree4edfccdcc3241e3dd0e7fbedf2c079afae35dd7b /indra/llcommon/tests
parent6233797388e36a9e781e3d7ebb735759fa8e7368 (diff)
Linux buildfix; this should be reverted after gcc update to 4.7+
Diffstat (limited to 'indra/llcommon/tests')
-rw-r--r--indra/llcommon/tests/lleventfilter_test.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/llcommon/tests/lleventfilter_test.cpp b/indra/llcommon/tests/lleventfilter_test.cpp
index 712864bf63..eb98b12ef5 100644
--- a/indra/llcommon/tests/lleventfilter_test.cpp
+++ b/indra/llcommon/tests/lleventfilter_test.cpp
@@ -88,29 +88,29 @@ public:
{}
/*----- implementation of LLEventThrottleBase timing functionality -----*/
- virtual void alarmActionAfter(F32 interval, const LLEventTimeoutBase::Action& action) override
+ virtual void alarmActionAfter(F32 interval, const LLEventTimeoutBase::Action& action) /*override*/
{
mAlarmRemaining = interval;
mAlarmAction = action;
}
- virtual bool alarmRunning() const override
+ virtual bool alarmRunning() const /*override*/
{
// decrementing to exactly 0 should mean the alarm fires
return mAlarmRemaining > 0;
}
- virtual void alarmCancel() override
+ virtual void alarmCancel() /*override*/
{
mAlarmRemaining = -1;
}
- virtual void timerSet(F32 interval) override
+ virtual void timerSet(F32 interval) /*override*/
{
mTimerRemaining = interval;
}
- virtual F32 timerGetRemaining() const override
+ virtual F32 timerGetRemaining() const /*override*/
{
// LLTimer.getRemainingTimeF32() never returns negative; 0.0 means expired
return (mTimerRemaining > 0.0)? mTimerRemaining : 0.0;