From c23959aa7a6bb1f81f1834fd68aed48962fd6e2e Mon Sep 17 00:00:00 2001 From: Jose Date: Thu, 11 Sep 2014 17:38:07 +0200 Subject: Revert "Fixed (ICE-3792) - dependencies in the repository are very crappy" This reverts commit 201d395c7186e50d195672db7b472989783826cb. Conflicts: cpp/config/Make.rules cpp/test/Ice/Makefile.mak --- cpp/src/Ice/LoggerAdminI.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'cpp/src/Ice/LoggerAdminI.cpp') diff --git a/cpp/src/Ice/LoggerAdminI.cpp b/cpp/src/Ice/LoggerAdminI.cpp index d393c3e53f8..3a59d2e7880 100644 --- a/cpp/src/Ice/LoggerAdminI.cpp +++ b/cpp/src/Ice/LoggerAdminI.cpp @@ -326,12 +326,9 @@ 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")) + _traceLevel(props->getPropertyAsInt("Ice.Trace.Admin.Logger")), + _remoteCallCompleted(newCallback(this, &LoggerAdminI::remoteCallCompleted)) { - // - // VC110 doesn't allow to use this in base member initializer - // - const_cast(_remoteCallCompleted) = newCallback(this, &LoggerAdminI::remoteCallCompleted); _oldestLog = _queue.end(); _oldestTrace = _queue.end(); } -- cgit v1.2.3