diff options
| author | Jose <jose@zeroc.com> | 2014-09-11 17:38:07 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-09-11 17:38:07 +0200 |
| commit | c23959aa7a6bb1f81f1834fd68aed48962fd6e2e (patch) | |
| tree | a1d14ec52574508a3e9e3492462c3a845e0912e7 /cpp/src/Ice/LoggerAdminI.cpp | |
| parent | Fix dependencies causing C++ rebuilds (diff) | |
| download | ice-c23959aa7a6bb1f81f1834fd68aed48962fd6e2e.tar.bz2 ice-c23959aa7a6bb1f81f1834fd68aed48962fd6e2e.tar.xz ice-c23959aa7a6bb1f81f1834fd68aed48962fd6e2e.zip | |
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
Diffstat (limited to 'cpp/src/Ice/LoggerAdminI.cpp')
| -rw-r--r-- | cpp/src/Ice/LoggerAdminI.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
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<CallbackPtr&>(_remoteCallCompleted) = newCallback(this, &LoggerAdminI::remoteCallCompleted); _oldestLog = _queue.end(); _oldestTrace = _queue.end(); } |