Removed the SUDP implementation (for now). See the tag sudp in CVS to

    recover.

1 files changed, 25 insertions, 13 deletions

diff --git a/cpp/src/Ice/Endpoint.cpp b/cpp/src/Ice/Endpoint.cpp
index 71c6b6b94fc..d282f8b749a 100644
--- a/cpp/src/Ice/Endpoint.cpp
+++ b/cpp/src/Ice/Endpoint.cpp
@@ -17,7 +17,7 @@
 #include <Ice/SslConnector.h>
 #include <Ice/SslTransceiver.h>
 #include <Ice/UdpTransceiver.h>
-#include <Ice/SUdpTransceiver.h>
+// #include <Ice/SUdpTransceiver.h>
 #include <Ice/BasicStream.h>
 #include <Ice/Exception.h>
 #include <Ice/Instance.h>
@@ -67,11 +67,13 @@ IceInternal::Endpoint::endpointFromString(const InstancePtr& instance, const str
     {
 	return new UdpEndpoint(instance, str.substr(end));
     }
-
+

+/*
     if (protocol == "sudp")
     {
 	return new SUdpEndpoint(instance, str.substr(end));
-    }
+    }

+*/
 
     throw EndpointParseException(__FILE__, __LINE__);
 }
@@ -101,12 +103,14 @@ IceInternal::Endpoint::streamRead(BasicStream* s, EndpointPtr& v)
 	    v = new UdpEndpoint(s);
 	    break;
 	}
-
+

+/*
 	case SUdpEndpointType:
 	{
 	    v = new SUdpEndpoint(s);
 	    break;
-	}
+	}

+*/
 
 	default:
 	{
@@ -564,11 +568,13 @@ IceInternal::TcpEndpoint::operator<(const Endpoint& r) const
 	{
 	    return false; // tcp is not "less than" udp
 	}
-
+

+/*
 	if (dynamic_cast<const SUdpEndpoint*>(&r))
 	{
 	    return false; // tcp is not "less than" sudp
-	}
+	}

+*/
 
 	if (dynamic_cast<const UnknownEndpoint*>(&r))
 	{
@@ -904,11 +910,13 @@ IceInternal::SslEndpoint::operator<(const Endpoint& r) const
 	{
 	    return false; // ssl is not "less than" udp
 	}
-
+

+/*
 	if (dynamic_cast<const SUdpEndpoint*>(&r))
 	{
 	    return false; // ssl is not "less than" sudp
-	}
+	}

+*/
 
 	if (dynamic_cast<const UnknownEndpoint*>(&r))
 	{
@@ -1239,11 +1247,13 @@ IceInternal::UdpEndpoint::operator<(const Endpoint& r) const
 	{
 	    return true; // udp is "less than" tcp
 	}
-
+

+/*
 	if (dynamic_cast<const SUdpEndpoint*>(&r))
 	{
 	    return false; // udp is not "less than" sudp
-	}
+	}

+*/
 
 	if (dynamic_cast<const UnknownEndpoint*>(&r))
 	{
@@ -1297,7 +1307,8 @@ IceInternal::UdpEndpoint::operator<(const Endpoint& r) const
 
     return false;
 }
-
+

+/*
 IceInternal::SUdpEndpoint::SUdpEndpoint(const InstancePtr& instance, const string& ho, Int po) :
     _instance(instance),
     _host(ho),
@@ -1631,4 +1642,5 @@ IceInternal::SUdpEndpoint::operator<(const Endpoint& r) const
     }
 
     return false;
-}
+}

+*/