From 4a90678cc7406b0c2c8dad5691cdc2555186931b Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Thu, 18 May 2017 03:13:57 +0300
Subject: [PATCH] Linux buildfix; this should be reverted after gcc update to
4.7+
---
indra/llcommon/lleventfilter.h | 10 +++++-----
indra/llcommon/tests/lleventfilter_test.cpp | 10 +++++-----
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/indra/llcommon/lleventfilter.h b/indra/llcommon/lleventfilter.h
index ccbbc8bd25b..ff8fc9bc7fc 100644
--- a/indra/llcommon/lleventfilter.h
+++ b/indra/llcommon/lleventfilter.h
@@ -336,11 +336,11 @@ class LLEventThrottle: public LLEventThrottleBase
LLEventThrottle(LLEventPump& source, F32 interval);
private:
- virtual void alarmActionAfter(F32 interval, const LLEventTimeoutBase::Action& action) override;
- virtual bool alarmRunning() const override;
- virtual void alarmCancel() override;
- virtual void timerSet(F32 interval) override;
- virtual F32 timerGetRemaining() const override;
+ virtual void alarmActionAfter(F32 interval, const LLEventTimeoutBase::Action& action) /*override*/;
+ virtual bool alarmRunning() const /*override*/;
+ virtual void alarmCancel() /*override*/;
+ virtual void timerSet(F32 interval) /*override*/;
+ virtual F32 timerGetRemaining() const /*override*/;
// use this to arrange a deferred flush() call
LLEventTimeout mAlarm;
diff --git a/indra/llcommon/tests/lleventfilter_test.cpp b/indra/llcommon/tests/lleventfilter_test.cpp
index 712864bf63d..eb98b12ef52 100644
--- a/indra/llcommon/tests/lleventfilter_test.cpp
+++ b/indra/llcommon/tests/lleventfilter_test.cpp
@@ -88,29 +88,29 @@ class TestEventThrottle: public LLEventThrottleBase
{}
/*----- 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;
--
GitLab