Removed default context support

1 files changed, 15 insertions, 24 deletions

diff --git a/cppe/src/IceE/ReferenceFactory.cpp b/cppe/src/IceE/ReferenceFactory.cpp
index cadc362c16b..6228974ee66 100644
--- a/cppe/src/IceE/ReferenceFactory.cpp
+++ b/cppe/src/IceE/ReferenceFactory.cpp
@@ -52,7 +52,6 @@ IceInternal::ReferenceFactory::copy(const Reference* r) const
 
 ReferencePtr
 IceInternal::ReferenceFactory::create(const Identity& ident,
-				      const SharedContextPtr& context,
 				      const string& facet,
 				      Reference::Mode mode,
 				      bool secure,
@@ -78,9 +77,9 @@ IceInternal::ReferenceFactory::create(const Identity& ident,
     // Create new reference
     //
 #ifdef ICEE_HAS_ROUTER
-    return new DirectReference(_instance, _communicator, ident, context, facet, mode, secure, endpoints, routerInfo);
+    return new DirectReference(_instance, _communicator, ident, facet, mode, secure, endpoints, routerInfo);
 #else
-    return new DirectReference(_instance, _communicator, ident, context, facet, mode, secure, endpoints);
+    return new DirectReference(_instance, _communicator, ident, facet, mode, secure, endpoints);
 #endif
 }
 
@@ -88,7 +87,6 @@ IceInternal::ReferenceFactory::create(const Identity& ident,
 
 ReferencePtr
 IceInternal::ReferenceFactory::create(const Identity& ident,
-				      const SharedContextPtr& context,
 				      const string& facet,
 				      Reference::Mode mode,
 				      bool secure,
@@ -114,10 +112,10 @@ IceInternal::ReferenceFactory::create(const Identity& ident,
     // Create new reference
     //
 #ifdef ICEE_HAS_ROUTER
-    return new IndirectReference(_instance, _communicator, ident, context, facet, mode, secure, adapterId, routerInfo,
+    return new IndirectReference(_instance, _communicator, ident, facet, mode, secure, adapterId, routerInfo,
 				locatorInfo);
 #else
-    return new IndirectReference(_instance, _communicator, ident, context, facet, mode, secure, adapterId, locatorInfo);
+    return new IndirectReference(_instance, _communicator, ident, facet, mode, secure, adapterId, locatorInfo);
 #endif
 }
 
@@ -125,7 +123,6 @@ IceInternal::ReferenceFactory::create(const Identity& ident,
 
 ReferencePtr
 IceInternal::ReferenceFactory::create(const Identity& ident,
-				      const SharedContextPtr& context,
 				      const string& facet,
 				      Reference::Mode mode,
 				      const vector<Ice::ConnectionPtr>& fixedConnections)
@@ -145,7 +142,7 @@ IceInternal::ReferenceFactory::create(const Identity& ident,
     //
     // Create new reference
     //
-    return new FixedReference(_instance, _communicator, ident, context, facet, mode, fixedConnections);
+    return new FixedReference(_instance, _communicator, ident, facet, mode, fixedConnections);
 }
 
 ReferencePtr
@@ -431,10 +428,9 @@ IceInternal::ReferenceFactory::create(const string& str)
     {
 #ifdef ICEE_HAS_LOCATOR
 #   ifdef ICEE_HAS_ROUTER
-	return create(ident, _instance->getDefaultContext(), facet, mode, secure, "", routerInfo,
-		      locatorInfo);
+	return create(ident, facet, mode, secure, "", routerInfo, locatorInfo);
 #   else
-	return create(ident, _instance->getDefaultContext(), facet, mode, secure, "", locatorInfo);
+	return create(ident, facet, mode, secure, "", locatorInfo);
 #   endif
 #else	
         FeatureNotSupportedException ex(__FILE__, __LINE__);
@@ -492,10 +488,9 @@ IceInternal::ReferenceFactory::create(const string& str)
 	    }
 
 #ifdef ICEE_HAS_ROUTER
-	    return create(ident, _instance->getDefaultContext(), facet, mode, secure, endpoints,
-	    		  routerInfo);
+	    return create(ident, facet, mode, secure, endpoints, routerInfo);
 #else
-	    return create(ident, _instance->getDefaultContext(), facet, mode, secure, endpoints);
+	    return create(ident, facet, mode, secure, endpoints);
 #endif
 	    break;
 	}
@@ -539,11 +534,9 @@ IceInternal::ReferenceFactory::create(const string& str)
 	    }
 
 #ifdef ICEE_HAS_ROUTER
-	    return create(ident, _instance->getDefaultContext(), facet, mode, secure, adapter, 
-	    		  routerInfo, locatorInfo);
+	    return create(ident, facet, mode, secure, adapter, routerInfo, locatorInfo);
 #else
-	    return create(ident, _instance->getDefaultContext(), facet, mode, secure, adapter,
-	    		  locatorInfo);
+	    return create(ident, facet, mode, secure, adapter, locatorInfo);
 #endif
 #else
             FeatureNotSupportedException ex(__FILE__, __LINE__);
@@ -622,10 +615,9 @@ IceInternal::ReferenceFactory::create(const Identity& ident, BasicStream* s)
 	    endpoints.push_back(endpoint);
 	}
 #ifdef ICEE_HAS_ROUTER
-	return create(ident, _instance->getDefaultContext(), facet, mode, secure, endpoints,
-		      routerInfo);
+	return create(ident, facet, mode, secure, endpoints, routerInfo);
 #else
-	return create(ident, _instance->getDefaultContext(), facet, mode, secure, endpoints);
+	return create(ident, facet, mode, secure, endpoints);
 #endif
     }
     else
@@ -634,11 +626,10 @@ IceInternal::ReferenceFactory::create(const Identity& ident, BasicStream* s)
 	LocatorInfoPtr locatorInfo = _instance->locatorManager()->get(getDefaultLocator());
 	s->read(adapterId);
 #   ifdef ICEE_HAS_ROUTER
-	return create(ident, _instance->getDefaultContext(), facet, mode, secure, adapterId,
+	return create(ident, facet, mode, secure, adapterId,
 		      routerInfo, locatorInfo);
 #   else
-	return create(ident, _instance->getDefaultContext(), facet, mode, secure, adapterId,
-		      locatorInfo);
+	return create(ident, facet, mode, secure, adapterId, locatorInfo);
 #   endif
 #else
 	throw ProxyUnmarshalException(__FILE__, __LINE__);