diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2006-12-13 15:01:36 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2006-12-13 15:01:36 +0000 |
| commit | 4835a16f5931d2129eb058a159932155ef86d5d1 (patch) | |
| tree | 621cb4ce4c72954efdb3040d9398558953080539 /cpp/src | |
| parent | Bug 1570 - object adapter configuration (diff) | |
| download | ice-4835a16f5931d2129eb058a159932155ef86d5d1.tar.bz2 ice-4835a16f5931d2129eb058a159932155ef86d5d1.tar.xz ice-4835a16f5931d2129eb058a159932155ef86d5d1.zip | |
Win32 fix
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IceGrid/Parser.cpp | 5 | ||||
| -rw-r--r-- | cpp/src/IceGrid/SessionManager.h | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/cpp/src/IceGrid/Parser.cpp b/cpp/src/IceGrid/Parser.cpp index e697102a3a3..27a6df6fbc0 100644 --- a/cpp/src/IceGrid/Parser.cpp +++ b/cpp/src/IceGrid/Parser.cpp @@ -1323,8 +1323,9 @@ Parser::dumpFile(const string& reader, const list<string>& origArgs) try { - string id = *(args.begin()); - string filename = *(++args.begin()); + vector<string>::const_iterator p = args.begin(); + string id = *p++; + string filename = *p++; cout << reader << " `" << id << "' " << filename << ": " << flush; Ice::StringSeq lines; diff --git a/cpp/src/IceGrid/SessionManager.h b/cpp/src/IceGrid/SessionManager.h index c4ebfc887f6..cec800908eb 100644 --- a/cpp/src/IceGrid/SessionManager.h +++ b/cpp/src/IceGrid/SessionManager.h @@ -122,7 +122,8 @@ public: assert(_nextAction != None); action = _nextAction; - registry = InternalRegistryPrx::uncheckedCast(_registry->ice_timeout(timeout.toMilliSeconds())); + registry = InternalRegistryPrx::uncheckedCast( + _registry->ice_timeout(static_cast<int>(timeout.toMilliSeconds()))); _nextAction = None; _state = InProgress; notifyAll(); |