diff options
| author | Jose <jose@zeroc.com> | 2014-09-10 17:36:20 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-09-10 17:36:20 +0200 |
| commit | 00dbbdfaeae1af7d7457329641bb0cf6e726ba3c (patch) | |
| tree | a658e21567cf3227ad52d948627fae5db1946140 /cpp/src/Ice/LoggerAdminI.cpp | |
| parent | ICE-5582 (SOCKs test), ICE-5314 (HTTP proxies), major refactoring of networki... (diff) | |
| download | ice-00dbbdfaeae1af7d7457329641bb0cf6e726ba3c.tar.bz2 ice-00dbbdfaeae1af7d7457329641bb0cf6e726ba3c.tar.xz ice-00dbbdfaeae1af7d7457329641bb0cf6e726ba3c.zip | |
Fixed (ICE-3792) - dependencies in the repository are very crappy
Diffstat (limited to 'cpp/src/Ice/LoggerAdminI.cpp')
| -rw-r--r-- | cpp/src/Ice/LoggerAdminI.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cpp/src/Ice/LoggerAdminI.cpp b/cpp/src/Ice/LoggerAdminI.cpp index 3a59d2e7880..d393c3e53f8 100644 --- a/cpp/src/Ice/LoggerAdminI.cpp +++ b/cpp/src/Ice/LoggerAdminI.cpp @@ -326,9 +326,12 @@ LoggerAdminI::LoggerAdminI(const string& name, const PropertiesPtr& props) : _maxLogCount(props->getPropertyAsIntWithDefault("Ice.Admin.Logger.KeepLogs", 100)), _traceCount(0), _maxTraceCount(props->getPropertyAsIntWithDefault("Ice.Admin.Logger.KeepTraces", 100)), - _traceLevel(props->getPropertyAsInt("Ice.Trace.Admin.Logger")), - _remoteCallCompleted(newCallback(this, &LoggerAdminI::remoteCallCompleted)) + _traceLevel(props->getPropertyAsInt("Ice.Trace.Admin.Logger")) { + // + // VC110 doesn't allow to use this in base member initializer + // + const_cast<CallbackPtr&>(_remoteCallCompleted) = newCallback(this, &LoggerAdminI::remoteCallCompleted); _oldestLog = _queue.end(); _oldestTrace = _queue.end(); } |