summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/ProtocolInstance.h
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2015-01-09 09:18:21 -0330
committerDwayne Boone <dwayne@zeroc.com>2015-01-09 09:18:21 -0330
commitd02b0603f1bd1b66b47673474bc167c65f619f93 (patch)
tree2176351e8b5a9452a1c453add92ebd77ee3dae16 /cpp/src/Ice/ProtocolInstance.h
parentICE-6196 added ProtocolInstance::secure() (diff)
downloadice-d02b0603f1bd1b66b47673474bc167c65f619f93.tar.bz2
ice-d02b0603f1bd1b66b47673474bc167c65f619f93.tar.xz
ice-d02b0603f1bd1b66b47673474bc167c65f619f93.zip
ICE-6196 Fixes for ProtocolInstance::secure()
Diffstat (limited to 'cpp/src/Ice/ProtocolInstance.h')
-rw-r--r--cpp/src/Ice/ProtocolInstance.h11
1 files changed, 8 insertions, 3 deletions
diff --git a/cpp/src/Ice/ProtocolInstance.h b/cpp/src/Ice/ProtocolInstance.h
index 3255f26f022..6500b09b52a 100644
--- a/cpp/src/Ice/ProtocolInstance.h
+++ b/cpp/src/Ice/ProtocolInstance.h
@@ -27,7 +27,7 @@ class ICE_API ProtocolInstance : public IceUtil::Shared
{
public:
- ProtocolInstance(const Ice::CommunicatorPtr&, Ice::Short, const std::string&);
+ ProtocolInstance(const Ice::CommunicatorPtr&, Ice::Short, const std::string&, bool);
int traceLevel() const
{
@@ -59,7 +59,11 @@ public:
return _properties;
}
- bool secure() const;
+ bool secure() const
+ {
+ return _secure;
+ }
+
bool preferIPv6() const;
ProtocolSupport protocolSupport() const;
const std::string& defaultHost() const;
@@ -74,7 +78,7 @@ public:
private:
- ProtocolInstance(const InstancePtr&, Ice::Short, const std::string&);
+ ProtocolInstance(const InstancePtr&, Ice::Short, const std::string&, bool);
friend class Instance;
const InstancePtr _instance;
@@ -85,6 +89,7 @@ protected:
const Ice::PropertiesPtr _properties;
const std::string _protocol;
const Ice::Short _type;
+ const bool _secure;
};
}