6 files changed, 8 insertions, 33 deletions
diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp
index 3dcaf0fc1c0..1ed7602f829 100644
--- a/cpp/src/Ice/ConnectionI.cpp
+++ b/cpp/src/Ice/ConnectionI.cpp
@@ -1350,24 +1350,6 @@ Ice::ConnectionI::toString() const
     return _desc; // No mutex lock, _desc is immutable.
 }
 
-bool
-Ice::ConnectionI::operator==(const ConnectionI& r) const
-{
-    return this == &r;
-}
-
-bool
-Ice::ConnectionI::operator!=(const ConnectionI& r) const
-{
-    return this != &r;
-}
-
-bool
-Ice::ConnectionI::operator<(const ConnectionI& r) const
-{
-    return this < &r;
-}
-
 Ice::ConnectionI::ConnectionI(const InstancePtr& instance,
 			      const TransceiverPtr& transceiver,
 			      const EndpointPtr& endpoint,
diff --git a/cpp/src/Ice/ConnectionI.h b/cpp/src/Ice/ConnectionI.h
index a61a3e3c522..ade06f548cd 100644
--- a/cpp/src/Ice/ConnectionI.h
+++ b/cpp/src/Ice/ConnectionI.h
@@ -93,13 +93,6 @@ public:
     virtual Ice::Int timeout() const; // From Connection.
     virtual std::string toString() const;  // From Connection and EvantHandler.
 
-    //
-    // Compare connections for sorting purposes.
-    //
-    virtual bool operator==(const ConnectionI&) const;
-    virtual bool operator!=(const ConnectionI&) const;
-    virtual bool operator<(const ConnectionI&) const;
-
 private:
 
     ConnectionI(const IceInternal::InstancePtr&, const IceInternal::TransceiverPtr&, 
diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp
index a51903c5487..e1e7bb8e918 100755
--- a/cpp/src/slice2cs/Gen.cpp
+++ b/cpp/src/slice2cs/Gen.cpp
@@ -4466,7 +4466,7 @@ Slice::Gen::TieVisitor::visitClassDefStart(const ClassDefPtr& p)
     ClassList bases = p->bases();
     for(ClassList::const_iterator i = bases.begin(); i != bases.end(); ++i)
     {
-        writeInheritedOperations(*i, opNames);
+        writeInheritedOperationsWithOpNames(*i, opNames);
     }
 
     _out << sp << nl << "private _" << name << opIntfName << " _ice_delegate;";
@@ -4481,7 +4481,7 @@ Slice::Gen::TieVisitor::visitClassDefEnd(const ClassDefPtr&)
 }
 
 void
-Slice::Gen::TieVisitor::writeInheritedOperations(const ClassDefPtr& p, NameSet& opNames)
+Slice::Gen::TieVisitor::writeInheritedOperationsWithOpNames(const ClassDefPtr& p, NameSet& opNames)
 {
     OperationList ops = p->operations();
     OperationList::const_iterator r;
@@ -4540,7 +4540,7 @@ Slice::Gen::TieVisitor::writeInheritedOperations(const ClassDefPtr& p, NameSet&
     ClassList bases = p->bases();
     for(ClassList::const_iterator i = bases.begin(); i != bases.end(); ++i)
     {
-        writeInheritedOperations(*i, opNames);
+        writeInheritedOperationsWithOpNames(*i, opNames);
     }
 }
 
diff --git a/cpp/src/slice2cs/Gen.h b/cpp/src/slice2cs/Gen.h
index 465babae58d..7d6e41763bb 100644
--- a/cpp/src/slice2cs/Gen.h
+++ b/cpp/src/slice2cs/Gen.h
@@ -214,7 +214,7 @@ private:
     private:
 
 	typedef ::std::set< ::std::string> NameSet;
-	void writeInheritedOperations(const ClassDefPtr&, NameSet&);
+	void writeInheritedOperationsWithOpNames(const ClassDefPtr&, NameSet&);
     };
 
     class BaseImplVisitor : public CsVisitor
diff --git a/cpp/src/slice2vb/Gen.cpp b/cpp/src/slice2vb/Gen.cpp
index 68acbab0fd0..d8069ce84d2 100755
--- a/cpp/src/slice2vb/Gen.cpp
+++ b/cpp/src/slice2vb/Gen.cpp
@@ -5072,7 +5072,7 @@ Slice::Gen::TieVisitor::visitClassDefStart(const ClassDefPtr& p)
     ClassList bases = p->bases();
     for(ClassList::const_iterator i = bases.begin(); i != bases.end(); ++i)
     {
-        writeInheritedOperations(*i, opNames);
+        writeInheritedOperationsWithOpNames(*i, opNames);
     }
 
     _out << sp << nl << "Private _ice_delegate As _" << name << opIntfName;
@@ -5088,7 +5088,7 @@ Slice::Gen::TieVisitor::visitClassDefEnd(const ClassDefPtr&)
 }
 
 void
-Slice::Gen::TieVisitor::writeInheritedOperations(const ClassDefPtr& p, NameSet& opNames)
+Slice::Gen::TieVisitor::writeInheritedOperationsWithOpNames(const ClassDefPtr& p, NameSet& opNames)
 {
     OperationList ops = p->operations();
     OperationList::const_iterator r;
@@ -5153,7 +5153,7 @@ Slice::Gen::TieVisitor::writeInheritedOperations(const ClassDefPtr& p, NameSet&
     ClassList bases = p->bases();
     for(ClassList::const_iterator i = bases.begin(); i != bases.end(); ++i)
     {
-        writeInheritedOperations(*i, opNames);
+        writeInheritedOperationsWithOpNames(*i, opNames);
     }
 }
 
diff --git a/cpp/src/slice2vb/Gen.h b/cpp/src/slice2vb/Gen.h
index 1277cc3e40e..26b3c63e1c2 100644
--- a/cpp/src/slice2vb/Gen.h
+++ b/cpp/src/slice2vb/Gen.h
@@ -214,7 +214,7 @@ private:
     private:
 
 	typedef ::std::set< ::std::string> NameSet;
-	void writeInheritedOperations(const ClassDefPtr&, NameSet&);
+	void writeInheritedOperationsWithOpNames(const ClassDefPtr&, NameSet&);
     };
 
     class BaseImplVisitor : public VbVisitor