diff options
author | Bernard Normier <bernard@zeroc.com> | 2018-10-26 17:17:11 -0400 |
---|---|---|
committer | Bernard Normier <bernard@zeroc.com> | 2018-10-26 17:17:11 -0400 |
commit | 42c905a3ca29a1e911e7def9c2d9d9b8e95383cd (patch) | |
tree | 1b704d084e39c0acd15859f2dd258eff7aaa7fc6 /cpp/src/IceGrid/IceGridNode.cpp | |
parent | Do not use time.clock() with Python >= 3.3 as it is deprecated (diff) | |
download | ice-42c905a3ca29a1e911e7def9c2d9d9b8e95383cd.tar.bz2 ice-42c905a3ca29a1e911e7def9c2d9d9b8e95383cd.tar.xz ice-42c905a3ca29a1e911e7def9c2d9d9b8e95383cd.zip |
Extra C++ warning flags with clang and g++.
Fixes 223.
Diffstat (limited to 'cpp/src/IceGrid/IceGridNode.cpp')
-rw-r--r-- | cpp/src/IceGrid/IceGridNode.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/IceGrid/IceGridNode.cpp b/cpp/src/IceGrid/IceGridNode.cpp index 87b0c97422d..e7177a60c7d 100644 --- a/cpp/src/IceGrid/IceGridNode.cpp +++ b/cpp/src/IceGrid/IceGridNode.cpp @@ -562,13 +562,13 @@ NodeService::startImpl(int argc, char* argv[], int& status) } else { - string id = communicator()->getProperties()->getProperty("IceGridAdmin.Username"); + string username = communicator()->getProperties()->getProperty("IceGridAdmin.Username"); string password = communicator()->getProperties()->getProperty("IceGridAdmin.Password"); - while(id.empty()) + while(username.empty()) { consoleOut << "user id: " << flush; - getline(cin, id); - id = IceUtilInternal::trim(id); + getline(cin, username); + username = IceUtilInternal::trim(username); } if(password.empty()) @@ -578,7 +578,7 @@ NodeService::startImpl(int argc, char* argv[], int& status) password = IceUtilInternal::trim(password); } - session = registry->createAdminSession(id, password); + session = registry->createAdminSession(username, password); } assert(session); |