Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice

1 files changed, 3 insertions, 3 deletions

diff --git a/cpp/src/IceGrid/Client.cpp b/cpp/src/IceGrid/Client.cpp
index 969fd81e248..c070016b001 100644
--- a/cpp/src/IceGrid/Client.cpp
+++ b/cpp/src/IceGrid/Client.cpp
@@ -161,7 +161,7 @@ public:
     void interrupted();
 
     Ice::CommunicatorPtr communicator() const { return _communicator; }
-    const char* appName() const { return _appName; }
+    const string& appName() const { return _appName; }
 
     string getPassword(const string&);
 
@@ -169,7 +169,7 @@ private:
 
     IceUtil::CtrlCHandler _ctrlCHandler;
     Ice::CommunicatorPtr _communicator;
-    const char* _appName;
+    string _appName;
     ParserPtr _parser;
 };
 
@@ -227,7 +227,7 @@ Client::main(Ice::StringSeq& args)
 
     try
     {
-        _appName = args[0].c_str();
+        _appName = args[0];
         _communicator = Ice::initialize(args);
         
         {