5 files changed, 11 insertions, 13 deletions
diff --git a/cpp/include/Ice/Ice.h b/cpp/include/Ice/Ice.h
index 806e1023de5..1cde549af8a 100644
--- a/cpp/include/Ice/Ice.h
+++ b/cpp/include/Ice/Ice.h
@@ -27,7 +27,7 @@
 #include <Ice/IncomingAsync.h>
 #include <Ice/Process.h>
 #include <Ice/Application.h>
-#include <Ice/TransportInfo.h>
+#include <Ice/Connection.h>
 #include <Ice/Functional.h>
 #include <Ice/Stream.h>
 
diff --git a/cpp/include/Ice/Incoming.h b/cpp/include/Ice/Incoming.h
index 9e9121d791a..1dba648fb75 100644
--- a/cpp/include/Ice/Incoming.h
+++ b/cpp/include/Ice/Incoming.h
@@ -24,8 +24,7 @@ class ICE_API IncomingBase : public IceUtil::noncopyable
 {
 protected:
 
-    IncomingBase(Instance*, Ice::ConnectionI*, const Ice::ObjectAdapterPtr&, 
-		 const Ice::TransportInfoPtr&, bool, Ice::Byte);
+    IncomingBase(Instance*, Ice::ConnectionI*, const Ice::ObjectAdapterPtr&, bool, Ice::Byte);
     IncomingBase(IncomingBase& in); // Adopts the argument. It must not be used afterwards.
     
     void __finishInvoke();
@@ -59,8 +58,7 @@ class ICE_API Incoming : public IncomingBase
 {
 public:
 
-    Incoming(Instance*, Ice::ConnectionI*, const Ice::ObjectAdapterPtr&, 
-	     const Ice::TransportInfoPtr&, bool, Ice::Byte);
+    Incoming(Instance*, Ice::ConnectionI*, const Ice::ObjectAdapterPtr&, bool, Ice::Byte);
 
     void invoke(const ServantManagerPtr&);
 
diff --git a/cpp/include/Ice/IncomingAsync.h b/cpp/include/Ice/IncomingAsync.h
index 2b7a310ae03..79539de81bc 100644
--- a/cpp/include/Ice/IncomingAsync.h
+++ b/cpp/include/Ice/IncomingAsync.h
@@ -52,7 +52,7 @@ private:
     // We need a separate ConnectionIPtr, because IncomingBase only
     // holds a ConnectionI* for optimization.
     //
-    const ::Ice::ConnectionIPtr _connectionCopy;
+    const Ice::ConnectionIPtr _connectionCopy;
 };
 
 }
diff --git a/cpp/include/Ice/Proxy.h b/cpp/include/Ice/Proxy.h
index 0e77d583c1b..2b10d88e301 100644
--- a/cpp/include/Ice/Proxy.h
+++ b/cpp/include/Ice/Proxy.h
@@ -122,7 +122,7 @@ public:
     ::Ice::ObjectPrx ice_collocationOptimization(bool) const;
     ::Ice::ObjectPrx ice_default() const;
 
-    ::Ice::TransportInfoPtr ice_getTransportInfo();
+    ::Ice::ConnectionPtr ice_getConnection();
 
     ::IceInternal::ReferencePtr __reference() const;
     void __copyFrom(const ::Ice::ObjectPrx&);
@@ -164,7 +164,7 @@ public:
     virtual bool ice_invoke(const ::std::string&, ::Ice::OperationMode, const ::std::vector< ::Ice::Byte>&,
 			    ::std::vector< ::Ice::Byte>&, const ::Ice::Context&) = 0;
 
-    virtual ::Ice::TransportInfoPtr ice_getTransportInfo() = 0;
+    virtual ::Ice::ConnectionPtr ice_getConnection() = 0;
 };
 
 } }
@@ -185,7 +185,7 @@ public:
     virtual bool ice_invoke(const ::std::string&, ::Ice::OperationMode, const ::std::vector< ::Ice::Byte>&,
 			    ::std::vector< ::Ice::Byte>&, const ::Ice::Context&);
 
-    virtual ::Ice::TransportInfoPtr ice_getTransportInfo();
+    virtual ::Ice::ConnectionPtr ice_getConnection();
 
     void __copyFrom(const ::IceInternal::Handle< ::IceDelegateM::Ice::Object>&);
 
@@ -217,7 +217,7 @@ public:
     virtual bool ice_invoke(const ::std::string&, ::Ice::OperationMode, const ::std::vector< ::Ice::Byte>&,
 			    ::std::vector< ::Ice::Byte>&, const ::Ice::Context&);
 
-    virtual ::Ice::TransportInfoPtr ice_getTransportInfo();
+    virtual ::Ice::ConnectionPtr ice_getConnection();
 
     void __copyFrom(const ::IceInternal::Handle< ::IceDelegateD::Ice::Object>&);
 
diff --git a/cpp/include/Slice/Parser.h b/cpp/include/Slice/Parser.h
index 9d0d1f6d761..598868872c0 100644
--- a/cpp/include/Slice/Parser.h
+++ b/cpp/include/Slice/Parser.h
@@ -401,15 +401,15 @@ public:
     SequenceList sequences() const;
     DictionaryList dictionaries() const;
     EnumList enums() const;
-    bool hasClassDecls() const;
     bool hasNonLocalClassDecls() const;
-    bool hasNonLocalInterfaceDefs() const;
+    bool hasNonLocalClassDefs() const;
     bool hasNonLocalSequences() const;
     bool hasNonLocalDictionaries() const;
+    bool hasNonLocalExceptions() const;
+    bool hasClassDecls() const;
     bool hasClassDefs() const;
     bool hasAbstractClassDefs() const;
     bool hasDataOnlyClasses() const;
-    bool hasNonLocalExceptions() const;
     bool hasOtherConstructedOrExceptions() const; // Exceptions or constructed types other than classes.
     bool hasContentsWithMetaData(const std::string&) const;
     bool hasAsyncOps() const;