summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/DescriptorParser.cpp
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2006-08-09 14:58:01 +0000
committerDwayne Boone <dwayne@zeroc.com>2006-08-09 14:58:01 +0000
commit3f862089b748741b30e343d2051a4747a3bff2f2 (patch)
tree18d1dde1504e2d510a24f4d55aeee21bfea7c04f /cpp/src/IceGrid/DescriptorParser.cpp
parentfixing bug 1291 (diff)
downloadice-3f862089b748741b30e343d2051a4747a3bff2f2.tar.bz2
ice-3f862089b748741b30e343d2051a4747a3bff2f2.tar.xz
ice-3f862089b748741b30e343d2051a4747a3bff2f2.zip
Borland C++Builder port mass commit
Diffstat (limited to 'cpp/src/IceGrid/DescriptorParser.cpp')
-rw-r--r--cpp/src/IceGrid/DescriptorParser.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/IceGrid/DescriptorParser.cpp b/cpp/src/IceGrid/DescriptorParser.cpp
index 8d1b715cad6..003e280d25f 100644
--- a/cpp/src/IceGrid/DescriptorParser.cpp
+++ b/cpp/src/IceGrid/DescriptorParser.cpp
@@ -780,10 +780,10 @@ DescriptorHandler::elementValue()
bool
DescriptorHandler::isTargetDeployable(const string& target) const
{
- string application = _currentApplication.get() ? _currentApplication->getDescriptor().name : "";
- string node = _currentNode.get() ? _currentNode->getName() : "";
- string server = _currentServer.get() ? _currentServer->getDescriptor()->id : "";
- string service = _currentService.get() ? _currentService->getDescriptor()->name : "";
+ string application = _currentApplication.get() ? _currentApplication->getDescriptor().name : string("");
+ string node = _currentNode.get() ? _currentNode->getName() : string("");
+ string server = _currentServer.get() ? _currentServer->getDescriptor()->id : string("");
+ string service = _currentService.get() ? _currentService->getDescriptor()->name : string("");
//
// Compute the current fully qualified name of the communicator.