diff options
| author | Bernard Normier <bernard@zeroc.com> | 2016-07-27 19:30:37 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2016-07-27 19:30:37 -0400 |
| commit | 883edab4361e58957796f25d5fc55cfb41f0f6ea (patch) | |
| tree | fc90adc372b66bf0becf4c0912794c64af250a29 /cpp/src/IceGrid/DescriptorBuilder.cpp | |
| parent | ICE-7242 - Cross test updates (diff) | |
| download | ice-883edab4361e58957796f25d5fc55cfb41f0f6ea.tar.bz2 ice-883edab4361e58957796f25d5fc55cfb41f0f6ea.tar.xz ice-883edab4361e58957796f25d5fc55cfb41f0f6ea.zip | |
Deprecate Communicator::stringToIdentity and identityToString
Diffstat (limited to 'cpp/src/IceGrid/DescriptorBuilder.cpp')
| -rw-r--r-- | cpp/src/IceGrid/DescriptorBuilder.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cpp/src/IceGrid/DescriptorBuilder.cpp b/cpp/src/IceGrid/DescriptorBuilder.cpp index ab6def85669..217cba7e7d6 100644 --- a/cpp/src/IceGrid/DescriptorBuilder.cpp +++ b/cpp/src/IceGrid/DescriptorBuilder.cpp @@ -10,6 +10,7 @@ #include <Ice/Communicator.h> #include <Ice/LoggerUtil.h> #include <Ice/LocalException.h> +#include <Ice/Initialize.h> #include <IceGrid/DescriptorBuilder.h> #include <IceGrid/Util.h> @@ -318,7 +319,7 @@ ApplicationDescriptorBuilder::addObject(const XmlAttributesHelper& attrs) { ObjectDescriptor object; object.type = attrs("type", ""); - object.id = _communicator->stringToIdentity(attrs("identity")); + object.id = Ice::stringToIdentity(attrs("identity")); object.proxyOptions = attrs("proxy-options", ""); if(attrs.contains("property")) { @@ -697,7 +698,7 @@ CommunicatorDescriptorBuilder::addObject(const XmlAttributesHelper& attrs) { ObjectDescriptor object; object.type = attrs("type", ""); - object.id = _communicator->stringToIdentity(attrs("identity")); + object.id = Ice::stringToIdentity(attrs("identity")); object.proxyOptions = attrs("proxy-options", ""); if(attrs.contains("property")) { @@ -711,7 +712,7 @@ CommunicatorDescriptorBuilder::addAllocatable(const XmlAttributesHelper& attrs) { ObjectDescriptor object; object.type = attrs("type", ""); - object.id = _communicator->stringToIdentity(attrs("identity")); + object.id = Ice::stringToIdentity(attrs("identity")); object.proxyOptions = attrs("proxy-options", ""); if(attrs.contains("property")) { |