diff options
| author | Bernard Normier <bernard@zeroc.com> | 2009-01-23 17:07:21 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2009-01-23 17:07:21 -0500 |
| commit | 2380e089401d048490da23bc6d71e5687bafbe47 (patch) | |
| tree | 6d97052d1f93bc2bafcd7fd1a9ebe103544b6cad /cpp/src/IceGrid/Parser.cpp | |
| parent | Fixed permissions (diff) | |
| parent | 3.3.1 third-party updates (diff) | |
| download | ice-2380e089401d048490da23bc6d71e5687bafbe47.tar.bz2 ice-2380e089401d048490da23bc6d71e5687bafbe47.tar.xz ice-2380e089401d048490da23bc6d71e5687bafbe47.zip | |
Merge branch 'R3_3_branch' of cvs:/home/git/ice into R3_3_branch
Conflicts:
java/resources/IceGridAdmin/icegridadmin_content_dyn.html
java/resources/IceGridAdmin/icegridadmin_content_static.html
Diffstat (limited to 'cpp/src/IceGrid/Parser.cpp')
| -rw-r--r-- | cpp/src/IceGrid/Parser.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cpp/src/IceGrid/Parser.cpp b/cpp/src/IceGrid/Parser.cpp index f7cc1383cc6..9d5c37df304 100644 --- a/cpp/src/IceGrid/Parser.cpp +++ b/cpp/src/IceGrid/Parser.cpp @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2009 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. @@ -1546,7 +1546,6 @@ Parser::listServices(const list<string>& args) } string server = args.front(); - string service = *(++args.begin()); try { ServerInfo info = _admin->getServerInfo(server); @@ -1991,7 +1990,7 @@ Parser::showFile(const string& reader, const list<string>& origArgs) void Parser::showBanner() { - cout << "Ice " << ICE_STRING_VERSION << " Copyright 2003-2008 ZeroC, Inc." << endl; + cout << "Ice " << ICE_STRING_VERSION << " Copyright 2003-2009 ZeroC, Inc." << endl; } void |