diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/Freeze/EvictorI.cpp | 7 | ||||
| -rw-r--r-- | cpp/src/Ice/LoggerUtil.cpp | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/cpp/src/Freeze/EvictorI.cpp b/cpp/src/Freeze/EvictorI.cpp index 3eaa91de3d9..e278dd630cc 100644 --- a/cpp/src/Freeze/EvictorI.cpp +++ b/cpp/src/Freeze/EvictorI.cpp @@ -211,14 +211,9 @@ Freeze::EvictorI::locate(const ObjectAdapterPtr& adapter, const Current& current } // - // This should work - but with MSVC for some reason it does not. Re-examine. - // - //ObjectPtr servant = p->second; - ObjectPtr servant = p->second; - - // // Add the new Servant to the evictor queue. // + ObjectPtr servant = p->second; element = add(current.identity, servant); // diff --git a/cpp/src/Ice/LoggerUtil.cpp b/cpp/src/Ice/LoggerUtil.cpp index 901c0c5a81d..1b803bc304a 100644 --- a/cpp/src/Ice/LoggerUtil.cpp +++ b/cpp/src/Ice/LoggerUtil.cpp @@ -100,7 +100,7 @@ Ice::Trace::flush() string s = _str.str(); if (!s.empty()) { - _logger->trace(s, _category); + _logger->trace(_category, s); } _str.str(""); } |