summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/NodeI.h
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2005-11-11 13:56:10 +0000
committerBenoit Foucher <benoit@zeroc.com>2005-11-11 13:56:10 +0000
commit930e9797f420ed538bc4e55ffeb76b8596e12715 (patch)
tree2fdac6237a544c168430c6e94804551117e094e0 /cpp/src/IceGrid/NodeI.h
parentfix a copy problem (diff)
downloadice-930e9797f420ed538bc4e55ffeb76b8596e12715.tar.bz2
ice-930e9797f420ed538bc4e55ffeb76b8596e12715.tar.xz
ice-930e9797f420ed538bc4e55ffeb76b8596e12715.zip
:activate() would contact the locator even if the OA id was empty.
Fixed a bug where ${node.os} for example couldn't be used in distribution directories. Unknown elements in XML file are now treated as errors.
Diffstat (limited to 'cpp/src/IceGrid/NodeI.h')
-rw-r--r--cpp/src/IceGrid/NodeI.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/IceGrid/NodeI.h b/cpp/src/IceGrid/NodeI.h
index 0c6732bdeb1..d02622892a0 100644
--- a/cpp/src/IceGrid/NodeI.h
+++ b/cpp/src/IceGrid/NodeI.h
@@ -39,8 +39,8 @@ public:
virtual void loadServer_async(const AMD_Node_loadServerPtr&, const std::string&, const ServerDescriptorPtr&,
const Ice::Current&);
virtual void destroyServer_async(const AMD_Node_destroyServerPtr&, const std::string&, const Ice::Current&);
- virtual void patch(const std::string&, const DistributionDescriptor&, const DistributionDescriptorDict&,
- bool, const Ice::Current&);
+ virtual void patch(const std::string&, const std::string&, const DistributionDescriptor&, bool,
+ const Ice::Current&);
virtual std::string getName(const Ice::Current& = Ice::Current()) const;
virtual std::string getHostname(const Ice::Current& = Ice::Current()) const;