1 files changed, 11 insertions, 11 deletions

diff --git a/cpp/src/Ice/ACM.cpp b/cpp/src/Ice/ACM.cpp
index cc20ccc070d..4048d17ab82 100644
--- a/cpp/src/Ice/ACM.cpp
+++ b/cpp/src/Ice/ACM.cpp
@@ -43,41 +43,41 @@ IceInternal::ACMConfig::ACMConfig(const Ice::PropertiesPtr& p,
     else
     {
         timeoutProperty = prefix + ".Timeout";
-    };
+    }
 
-    int timeout = p->getPropertyAsIntWithDefault(timeoutProperty, static_cast<int>(dflt.timeout.toSeconds()));
-    if(timeout >= 0)
+    int timeoutVal = p->getPropertyAsIntWithDefault(timeoutProperty, static_cast<int>(dflt.timeout.toSeconds()));
+    if(timeoutVal >= 0)
     {
-        this->timeout = IceUtil::Time::seconds(timeout);
+        timeout = IceUtil::Time::seconds(timeoutVal);
     }
     else
     {
         l->warning("invalid value for property `" + timeoutProperty + "', default value will be used instead");
-        this->timeout = dflt.timeout;
+        timeout = dflt.timeout;
     }
 
     int hb = p->getPropertyAsIntWithDefault(prefix + ".Heartbeat", static_cast<int>(dflt.heartbeat));
     if(hb >= static_cast<int>(ICE_ENUM(ACMHeartbeat, HeartbeatOff)) &&
        hb <= static_cast<int>(ICE_ENUM(ACMHeartbeat, HeartbeatAlways)))
     {
-        this->heartbeat = static_cast<Ice::ACMHeartbeat>(hb);
+        heartbeat = static_cast<Ice::ACMHeartbeat>(hb);
     }
     else
     {
         l->warning("invalid value for property `" + prefix + ".Heartbeat" + "', default value will be used instead");
-        this->heartbeat = dflt.heartbeat;
+        heartbeat = dflt.heartbeat;
     }
 
     int cl = p->getPropertyAsIntWithDefault(prefix + ".Close", static_cast<int>(dflt.close));
     if(cl >= static_cast<int>(ICE_ENUM(ACMClose, CloseOff)) &&
        cl <= static_cast<int>(ICE_ENUM(ACMClose, CloseOnIdleForceful)))
     {
-        this->close = static_cast<Ice::ACMClose>(cl);
+        close = static_cast<Ice::ACMClose>(cl);
     }
     else
     {
         l->warning("invalid value for property `" + prefix + ".Close" + "', default value will be used instead");
-        this->close = dflt.close;
+        close = dflt.close;
     }
 }
 
@@ -307,7 +307,7 @@ IceInternal::ConnectionACMMonitor::~ConnectionACMMonitor()
 }
 
 void
-IceInternal::ConnectionACMMonitor::add(const ConnectionIPtr& connection)
+IceInternal::ConnectionACMMonitor::add(ICE_MAYBE_UNUSED const ConnectionIPtr& connection)
 {
     Lock sync(*this);
     assert(!_connection && connection);
@@ -319,7 +319,7 @@ IceInternal::ConnectionACMMonitor::add(const ConnectionIPtr& connection)
 }
 
 void
-IceInternal::ConnectionACMMonitor::remove(const ConnectionIPtr& connection)
+IceInternal::ConnectionACMMonitor::remove(ICE_MAYBE_UNUSED const ConnectionIPtr& connection)
 {
     Lock sync(*this);
     assert(_connection == connection);