Added support for encoding versioning

1 files changed, 13 insertions, 43 deletions

diff --git a/cpp/src/Ice/UdpConnector.cpp b/cpp/src/Ice/UdpConnector.cpp
index 90ff86faf69..476859c6ba8 100644
--- a/cpp/src/Ice/UdpConnector.cpp
+++ b/cpp/src/Ice/UdpConnector.cpp
@@ -49,27 +49,17 @@ IceInternal::UdpConnector::operator==(const Connector& r) const
         return false;
     }
 
-    if(_connectionId != p->_connectionId)
-    {
-        return false;
-    }
-
-    if(_protocolMajor != p->_protocolMajor)
-    {
-        return false;
-    }
-
-    if(_protocolMinor != p->_protocolMinor)
+    if(_protocol != p->_protocol)
     {
         return false;
     }
 
-    if(_encodingMajor != p->_encodingMajor)
+    if(_encoding != p->_encoding)
     {
         return false;
     }
 
-    if(_encodingMinor != p->_encodingMinor)
+    if(_connectionId != p->_connectionId)
     {
         return false;
     }
@@ -102,47 +92,29 @@ IceInternal::UdpConnector::operator<(const Connector& r) const
         return type() < r.type();
     }
 
-    if(_connectionId < p->_connectionId)
-    {
-        return true;
-    }
-    else if(p->_connectionId < _connectionId)
-    {
-        return false;
-    }
-
-    if(_protocolMajor < p->_protocolMajor)
-    {
-        return true;
-    }
-    else if(p->_protocolMajor < _protocolMajor)
-    {
-        return false;
-    }
-
-    if(_protocolMinor < p->_protocolMinor)
+    if(_protocol < p->_protocol)
     {
         return true;
     }
-    else if(p->_protocolMinor < _protocolMinor)
+    else if(p->_protocol < _protocol)
     {
         return false;
     }
 
-    if(_encodingMajor < p->_encodingMajor)
+    if(_encoding < p->_encoding)
     {
         return true;
     }
-    else if(p->_encodingMajor < _encodingMajor)
+    else if(p->_encoding < _encoding)
     {
         return false;
     }
 
-    if(_encodingMinor < p->_encodingMinor)
+    if(_connectionId < p->_connectionId)
     {
         return true;
     }
-    else if(p->_encodingMinor < _encodingMinor)
+    else if(p->_connectionId < _connectionId)
     {
         return false;
     }
@@ -170,17 +142,15 @@ IceInternal::UdpConnector::operator<(const Connector& r) const
 
 
 IceInternal::UdpConnector::UdpConnector(const InstancePtr& instance, const struct sockaddr_storage& addr, 
-                                        const string& mcastInterface, int mcastTtl, Ice::Byte protocolMajor,
-                                        Ice::Byte protocolMinor, Ice::Byte encodingMajor, Ice::Byte encodingMinor,
+                                        const string& mcastInterface, int mcastTtl, 
+                                        const Ice::ProtocolVersion& protocol, const Ice::EncodingVersion& encoding, 
                                         const std::string& connectionId) :
     _instance(instance),
     _addr(addr),
     _mcastInterface(mcastInterface),
     _mcastTtl(mcastTtl),
-    _protocolMajor(protocolMajor),
-    _protocolMinor(protocolMinor),
-    _encodingMajor(encodingMajor),
-    _encodingMinor(encodingMinor),
+    _protocol(protocol),
+    _encoding(encoding),
     _connectionId(connectionId)
 {
 }