summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/WSEndpoint.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2015-02-06 11:43:41 +0100
committerBenoit Foucher <benoit@zeroc.com>2015-02-06 11:43:41 +0100
commite591999d8782430e68c5917552ae50aa9bcf1e9d (patch)
tree287d1d317c8d60cbbe76e63bcbed20e75e12cee6 /cpp/src/Ice/WSEndpoint.cpp
parentMinor fix to Ice discovery hello server configuration (diff)
downloadice-e591999d8782430e68c5917552ae50aa9bcf1e9d.tar.bz2
ice-e591999d8782430e68c5917552ae50aa9bcf1e9d.tar.xz
ice-e591999d8782430e68c5917552ae50aa9bcf1e9d.zip
Added C++ plugins for endpoint factories, cleaned up registration of WS factories
Diffstat (limited to 'cpp/src/Ice/WSEndpoint.cpp')
-rw-r--r--cpp/src/Ice/WSEndpoint.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/cpp/src/Ice/WSEndpoint.cpp b/cpp/src/Ice/WSEndpoint.cpp
index 31c57823238..54acdef77c4 100644
--- a/cpp/src/Ice/WSEndpoint.cpp
+++ b/cpp/src/Ice/WSEndpoint.cpp
@@ -14,6 +14,7 @@
#include <Ice/LocalException.h>
#include <Ice/IPEndpointI.h>
#include <Ice/HashUtil.h>
+#include <Ice/EndpointFactoryManager.h>
using namespace std;
using namespace Ice;
@@ -26,8 +27,8 @@ IceInternal::WSEndpoint::WSEndpoint(const ProtocolInstancePtr& instance, const E
{
}
-IceInternal::WSEndpoint::WSEndpoint(const ProtocolInstancePtr& instance, const EndpointIPtr& del, vector<string>& args) :
- _instance(instance), _delegate(IPEndpointIPtr::dynamicCast(del))
+IceInternal::WSEndpoint::WSEndpoint(const ProtocolInstancePtr& inst, const EndpointIPtr& del, vector<string>& args) :
+ _instance(inst), _delegate(IPEndpointIPtr::dynamicCast(del))
{
initWithOptions(args);