more TransportInfo stuff

16 files changed, 167 insertions, 124 deletions

diff --git a/cpp/include/Ice/Ice.h b/cpp/include/Ice/Ice.h
index 52bbfff1eaa..8ac0e2c9be7 100644
--- a/cpp/include/Ice/Ice.h
+++ b/cpp/include/Ice/Ice.h
@@ -28,5 +28,6 @@
 #include <Ice/Process.h>
 #include <Ice/Application.h>
 #include <Ice/TransportInfo.h>
+#include <Ice/Functional.h>
 
 #endif
diff --git a/cpp/slice/Ice/TransportInfo.ice b/cpp/slice/Ice/TransportInfo.ice
index 13d2a6abd8e..c3cf64ec297 100644
--- a/cpp/slice/Ice/TransportInfo.ice
+++ b/cpp/slice/Ice/TransportInfo.ice
@@ -27,7 +27,7 @@ local interface TransportInfo
      * this connection to be sent to the server.
      *
      **/
-//    void flushBatchRequests();
+    void flushBatchRequests();
 
     /**
      *
diff --git a/cpp/src/Glacier2/Blobject.cpp b/cpp/src/Glacier2/Blobject.cpp
index 348a7004f59..23ef1a5bc0d 100644
--- a/cpp/src/Glacier2/Blobject.cpp
+++ b/cpp/src/Glacier2/Blobject.cpp
@@ -160,7 +160,6 @@ Glacier::Blobject::modifyProxy(ObjectPrx& proxy, const Current& current) const
 	proxy = proxy->ice_newFacet(current.facet);
     }
 
-    bool batch = false;
 
     Context::const_iterator p = current.ctx.find("_fwd");
     if(p != current.ctx.end())
@@ -173,35 +172,30 @@ Glacier::Blobject::modifyProxy(ObjectPrx& proxy, const Current& current) const
 		case 't':
 		{
 		    proxy = proxy->ice_twoway();
-		    batch = false;
 		    break;
 		}
 		
 		case 'o':
 		{
 		    proxy = proxy->ice_oneway();
-		    batch = false;
 		    break;
 		}
 		
 		case 'd':
 		{
 		    proxy = proxy->ice_datagram();
-		    batch = false;
 		    break;
 		}
 		
 		case 'O':
 		{
 		    proxy = proxy->ice_batchOneway();
-		    batch = true;
 		    break;
 		}
 		
 		case 'D':
 		{
 		    proxy = proxy->ice_batchDatagram();
-		    batch = true;
 		    break;
 		}
 		
diff --git a/cpp/src/Glacier2/Request.cpp b/cpp/src/Glacier2/Request.cpp
index 1a04116692c..35bef8a9cfa 100644
--- a/cpp/src/Glacier2/Request.cpp
+++ b/cpp/src/Glacier2/Request.cpp
@@ -8,6 +8,7 @@
 // **********************************************************************
 
 #include <Glacier2/Request.h>
+#include <set>
 
 using namespace std;
 using namespace Ice;
@@ -167,6 +168,7 @@ Glacier::RequestQueue::run()
     {
 	CommunicatorPtr communicator;
 	vector<RequestPtr> requests;
+	set<TransportInfoPtr> flushSet;
 
         {
             IceUtil::Monitor<IceUtil::Mutex>::Lock lock(*this);
@@ -198,9 +200,15 @@ Glacier::RequestQueue::run()
         {
 	    for(vector<RequestPtr>::const_iterator p = requests.begin(); p != requests.end(); ++p)
 	    {
+		const ObjectPrx& proxy = (*p)->getProxy();
+
+		if(proxy->ice_batchOneway() || proxy->ice_batchDatagram())
+		{
+		    flushSet.insert(proxy->ice_getTransportInfo());
+		}
+
 		if(_traceLevel >= 2)
 		{
-		    const ObjectPrx& proxy = (*p)->getProxy();
 		    const Current& current = (*p)->getCurrent();
 		    
 		    Trace out(_logger, "Glacier");
@@ -216,6 +224,8 @@ Glacier::RequestQueue::run()
 
 		(*p)->invoke();
 	    }
+
+	    for_each(flushSet.begin(), flushSet.end(), Ice::voidMemFun(TransportInfo::flushBatchRequests));
 	}
         catch(const Ice::Exception& ex)
         {
@@ -231,28 +241,6 @@ Glacier::RequestQueue::run()
 		out << "routing exception:\n" << ex;
 	    }
         }
-
-	try
-	{
-	    //
-	    // This sends all batched requests.
-	    //
-	    communicator->flushBatchRequests();
-	}
-	catch(const Ice::Exception& ex)
-	{
-            IceUtil::Monitor<IceUtil::Mutex>::Lock lock(*this);
-
-	    if(_traceLevel >= 1)
-	    {
-		Trace out(_logger, "Glacier");
-		if(_reverse)
-		{
-		    out << "reverse ";
-		}
-		out << "batch routing exception:\n" << ex;
-	    }
-	}
 	
 	//
 	// In order to avoid flooding, we add a delay, if so
diff --git a/cpp/src/Ice/Connection.cpp b/cpp/src/Ice/Connection.cpp
index df87a9678b3..87dc37f1cb4 100644
--- a/cpp/src/Ice/Connection.cpp
+++ b/cpp/src/Ice/Connection.cpp
@@ -13,7 +13,7 @@
 #include <Ice/Properties.h>
 #include <Ice/TraceUtil.h>
 #include <Ice/Transceiver.h>
-#include <Ice/TransportInfo.h>
+#include <Ice/TransportInfoI.h>
 #include <Ice/ThreadPool.h>
 #include <Ice/ConnectionMonitor.h>
 #include <Ice/ObjectAdapterI.h> // For getThreadPool() and getServantManager().
@@ -175,6 +175,12 @@ IceInternal::Connection::validate()
     // We start out in holding state.
     //
     setState(StateHolding);
+
+    //
+    // The TransportInfo object needs this connection for flushing
+    // batch requests.
+    //
+    dynamic_cast<TransportInfoI*>(_info.get())->setConnection(this);
 }
 
 void
@@ -1424,6 +1430,7 @@ IceInternal::Connection::finished(const ThreadPoolPtr& threadPool)
 
 	    assert(_transceiver);
 	    _transceiver = 0;
+	    dynamic_cast<TransportInfoI*>(_info.get())->setConnection(0); // Break cyclic dependency.
 	    notifyAll();
 	}
 
@@ -1715,6 +1722,7 @@ IceInternal::Connection::setState(State state)
 		}
 
 		_transceiver = 0;
+		dynamic_cast<TransportInfoI*>(_info.get())->setConnection(0); // Break cyclic dependency.
 		//notifyAll(); // We notify already below.
 	    }
 	    else
@@ -1953,38 +1961,3 @@ IceInternal::Connection::doUncompress(BasicStream& compressed, BasicStream& unco
 
     copy(compressed.b.begin(), compressed.b.begin() + headerSize, uncompressed.b.begin());
 }
-
-/*
-void
-Ice::ConnectionHandleI::flushBatchRequests()
-{
-    IceUtil::Mutex::Lock sync(*this);
-    if(_connection)
-    {
-	_connection->flushBatchRequest();
-    }
-}
-
-TransportInfoPtr
-Ice::ConnectionHandleI::getTransportInfo() const
-{
-    //
-    // No mutex lock necessary, _info is immutable;
-    //
-    return _info;
-}
-
-Ice::ConnectionHandleI::ConnectionHandleI(const ConnectionPtr& connection, const TransportInfoPtr& info) :
-    _connection(connection),
-    _info(info)
-{
-}
-
-void
-Ice::ConnectionHandleI::destroy()
-{
-    IceUtil::Mutex::Lock sync(*this);
-    assert(_connection);
-    _connection = 0;
-}
-*/
diff --git a/cpp/src/Ice/LoggerI.h b/cpp/src/Ice/LoggerI.h
index 121ed1b0a11..3b1c7e792cf 100644
--- a/cpp/src/Ice/LoggerI.h
+++ b/cpp/src/Ice/LoggerI.h
@@ -19,6 +19,7 @@ namespace Ice
 class LoggerI : public Logger
 {
 public:
+
     LoggerI(const std::string&, bool);
 
     virtual void trace(const std::string&, const std::string&);
diff --git a/cpp/src/Ice/Makefile b/cpp/src/Ice/Makefile
index 86859fb7cdc..061fe3fe776 100644
--- a/cpp/src/Ice/Makefile
+++ b/cpp/src/Ice/Makefile
@@ -78,6 +78,7 @@ OBJS		= Initialize.o \
 		  TcpTransceiver.o \
 		  UdpTransceiver.o \
 		  TransportInfo.o \
+		  TransportInfoI.o \
 		  DynamicLibrary.o \
 		  Plugin.o \
 		  PluginManagerI.o \
diff --git a/cpp/src/Ice/TcpTransceiver.h b/cpp/src/Ice/TcpTransceiver.h
index d77d17c3aae..dccc2283f6a 100644
--- a/cpp/src/Ice/TcpTransceiver.h
+++ b/cpp/src/Ice/TcpTransceiver.h
@@ -15,7 +15,7 @@
 #include <Ice/LoggerF.h>
 #include <Ice/StatsF.h>
 #include <Ice/Transceiver.h>
-#include <Ice/TransportInfo.h>
+#include <Ice/TransportInfoI.h>
 
 namespace IceInternal
 {
@@ -56,7 +56,7 @@ private:
 namespace Ice
 {
 
-class TcpTransportInfoI : public TransportInfo
+class TcpTransportInfoI : public TransportInfoI
 {
 public:
 
diff --git a/cpp/src/Ice/TransportInfoI.cpp b/cpp/src/Ice/TransportInfoI.cpp
new file mode 100755
index 00000000000..8b035e94195
--- /dev/null
+++ b/cpp/src/Ice/TransportInfoI.cpp
@@ -0,0 +1,41 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#include <Ice/TransportInfoI.h>
+#include <Ice/Connection.h>
+
+using namespace std;
+using namespace Ice;
+using namespace IceInternal;
+
+void
+Ice::TransportInfoI::flushBatchRequests()
+{
+    ConnectionPtr connection;
+
+    {
+	IceUtil::Mutex::Lock sync(_connectionMutex);
+	connection = _connection;
+    }
+
+    //
+    // We flush outside the mutex lock, to avoid potential deadlocks.
+    //
+    if(connection)
+    {
+	connection->flushBatchRequest();
+    }
+}
+
+void
+Ice::TransportInfoI::setConnection(const ConnectionPtr& connection)
+{
+    IceUtil::Mutex::Lock sync(_connectionMutex);
+    _connection = connection;
+}
diff --git a/cpp/src/Ice/TransportInfoI.h b/cpp/src/Ice/TransportInfoI.h
new file mode 100644
index 00000000000..affc9dccf9e
--- /dev/null
+++ b/cpp/src/Ice/TransportInfoI.h
@@ -0,0 +1,38 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef ICE_TRANSPORT_INFO_I_H
+#define ICE_TRANSPORT_INFO_I_H
+
+#include <IceUtil/Mutex.h>
+#include <Ice/ConnectionF.h>
+#include <Ice/TransportInfo.h>
+
+namespace Ice
+{
+
+class ICE_PROTOCOL_API TransportInfoI : public TransportInfo
+{
+public:
+
+    virtual void flushBatchRequests();
+
+private:
+
+    // This method is for IceInternal::Connection only.
+    friend class IceInternal::Connection;
+    void setConnection(const IceInternal::ConnectionPtr&);
+
+    IceInternal::ConnectionPtr _connection;
+    IceUtil::Mutex _connectionMutex;
+};
+
+}
+
+#endif
diff --git a/cpp/src/Ice/UdpTransceiver.h b/cpp/src/Ice/UdpTransceiver.h
index 959afbf6f93..7cd0e782929 100644
--- a/cpp/src/Ice/UdpTransceiver.h
+++ b/cpp/src/Ice/UdpTransceiver.h
@@ -75,7 +75,7 @@ private:
 namespace Ice
 {
 
-class UdpTransportInfoI : public TransportInfo
+class UdpTransportInfoI : public TransportInfoI
 {
 public:
 
diff --git a/cpp/src/Ice/ice.dsp b/cpp/src/Ice/ice.dsp
index ab9a74cf097..94744d59747 100644
--- a/cpp/src/Ice/ice.dsp
+++ b/cpp/src/Ice/ice.dsp
@@ -358,19 +358,15 @@ SOURCE=.\Service.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\SliceChecksums.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\SliceChecksumDict.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Stats.cpp

+SOURCE=.\SliceChecksums.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\TransportInfo.cpp

+SOURCE=.\Stats.cpp

 # End Source File

 # Begin Source File

 

@@ -406,6 +402,14 @@ SOURCE=.\Transceiver.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\TransportInfo.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\TransportInfoI.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\UdpEndpoint.cpp

 # End Source File

 # Begin Source File

@@ -846,11 +850,11 @@ SOURCE=..\..\include\Ice\Service.h
 # End Source File

 # Begin Source File

 

-SOURCE=..\..\include\Ice\SliceChecksums.h

+SOURCE=..\..\include\Ice\SliceChecksumDict.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\include\Ice\SliceChecksumDict.h

+SOURCE=..\..\include\Ice\SliceChecksums.h

 # End Source File

 # Begin Source File

 

@@ -862,14 +866,6 @@ SOURCE=..\..\include\Ice\StatsF.h
 # End Source File

 # Begin Source File

 

-SOURCE=..\..\include\Ice\TransportInfo.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\Ice\TransportInfoF.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\StreamI.h

 # End Source File

 # Begin Source File

@@ -918,6 +914,18 @@ SOURCE=.\TransceiverF.h
 # End Source File

 # Begin Source File

 

+SOURCE=..\..\include\Ice\TransportInfo.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\include\Ice\TransportInfoF.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\TransportInfoI.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\UdpEndpoint.h

 # End Source File

 # Begin Source File

@@ -1147,41 +1155,41 @@ BuildCmds= \
 # End Source File

 # Begin Source File

 

-SOURCE=..\..\slice\Ice\Identity.ice

+SOURCE=..\..\slice\Ice\FacetMap.ice

 

 !IF  "$(CFG)" == "Ice - Win32 Release"

 

-USERDEP__IDENT="..\..\bin\slice2cpp.exe"	"..\..\lib\slice.lib"	

+USERDEP__FACET="..\..\bin\slice2cpp.exe"	"..\..\lib\slice.lib"	

 # Begin Custom Build

-InputPath=..\..\slice\Ice\Identity.ice

+InputPath=..\..\slice\Ice\FacetMap.ice

 

 BuildCmds= \

-	..\..\bin\slice2cpp.exe --ice --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/Identity.ice \

-	move Identity.h ..\..\include\Ice \

+	..\..\bin\slice2cpp.exe --ice --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/FacetMap.ice \

+	move FacetMap.h ..\..\include\Ice \

 	

 

-"..\..\include\Ice\Identity.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"..\..\include\Ice\FacetMap.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"Identity.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"FacetMap.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 # End Custom Build

 

 !ELSEIF  "$(CFG)" == "Ice - Win32 Debug"

 

-USERDEP__IDENT="..\..\bin\slice2cpp.exe"	"..\..\lib\sliced.lib"	

+USERDEP__FACET="..\..\bin\slice2cpp.exe"	"..\..\lib\sliced.lib"	

 # Begin Custom Build

-InputPath=..\..\slice\Ice\Identity.ice

+InputPath=..\..\slice\Ice\FacetMap.ice

 

 BuildCmds= \

-	..\..\bin\slice2cpp.exe --ice --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/Identity.ice \

-	move Identity.h ..\..\include\Ice \

+	..\..\bin\slice2cpp.exe --ice --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/FacetMap.ice \

+	move FacetMap.h ..\..\include\Ice \

 	

 

-"..\..\include\Ice\Identity.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"..\..\include\Ice\FacetMap.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"Identity.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"FacetMap.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 # End Custom Build

 

@@ -1190,23 +1198,23 @@ BuildCmds= \
 # End Source File

 # Begin Source File

 

-SOURCE=..\..\slice\Ice\FacetMap.ice

+SOURCE=..\..\slice\Ice\Identity.ice

 

 !IF  "$(CFG)" == "Ice - Win32 Release"

 

 USERDEP__IDENT="..\..\bin\slice2cpp.exe"	"..\..\lib\slice.lib"	

 # Begin Custom Build

-InputPath=..\..\slice\Ice\FacetMap.ice

+InputPath=..\..\slice\Ice\Identity.ice

 

 BuildCmds= \

-	..\..\bin\slice2cpp.exe --ice --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/FacetMap.ice \

-	move FacetMap.h ..\..\include\Ice \

+	..\..\bin\slice2cpp.exe --ice --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/Identity.ice \

+	move Identity.h ..\..\include\Ice \

 	

 

-"..\..\include\Ice\FacetMap.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"..\..\include\Ice\Identity.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"FacetMap.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"Identity.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 # End Custom Build

 

@@ -1214,17 +1222,17 @@ BuildCmds= \
 

 USERDEP__IDENT="..\..\bin\slice2cpp.exe"	"..\..\lib\sliced.lib"	

 # Begin Custom Build

-InputPath=..\..\slice\Ice\FacetMap.ice

+InputPath=..\..\slice\Ice\Identity.ice

 

 BuildCmds= \

-	..\..\bin\slice2cpp.exe --ice --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/FacetMap.ice \

-	move FacetMap.h ..\..\include\Ice \

+	..\..\bin\slice2cpp.exe --ice --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/Identity.ice \

+	move Identity.h ..\..\include\Ice \

 	

 

-"..\..\include\Ice\FacetMap.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"..\..\include\Ice\Identity.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"FacetMap.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"Identity.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 # End Custom Build

 

@@ -1658,7 +1666,7 @@ SOURCE=..\..\slice\Ice\Process.ice
 

 !IF  "$(CFG)" == "Ice - Win32 Release"

 

-USERDEP__PLUGI="..\..\bin\slice2cpp.exe"	"..\..\lib\slice.lib"	

+USERDEP__PROCE="..\..\bin\slice2cpp.exe"	"..\..\lib\slice.lib"	

 # Begin Custom Build

 InputPath=..\..\slice\Ice\Process.ice

 

@@ -1676,7 +1684,7 @@ BuildCmds= \
 

 !ELSEIF  "$(CFG)" == "Ice - Win32 Debug"

 

-USERDEP__PLUGI="..\..\bin\slice2cpp.exe"	"..\..\lib\sliced.lib"	

+USERDEP__PROCE="..\..\bin\slice2cpp.exe"	"..\..\lib\sliced.lib"	

 # Begin Custom Build

 InputPath=..\..\slice\Ice\Process.ice

 

@@ -1701,7 +1709,7 @@ SOURCE=..\..\slice\Ice\ProcessF.ice
 

 !IF  "$(CFG)" == "Ice - Win32 Release"

 

-USERDEP__PLUGIN="..\..\bin\slice2cpp.exe"	"..\..\lib\slice.lib"	

+USERDEP__PROCES="..\..\bin\slice2cpp.exe"	"..\..\lib\slice.lib"	

 # Begin Custom Build

 InputPath=..\..\slice\Ice\ProcessF.ice

 

@@ -1714,7 +1722,7 @@ InputPath=..\..\slice\Ice\ProcessF.ice
 

 !ELSEIF  "$(CFG)" == "Ice - Win32 Debug"

 

-USERDEP__PLUGIN="..\..\bin\slice2cpp.exe"	"..\..\lib\sliced.lib"	

+USERDEP__PROCES="..\..\bin\slice2cpp.exe"	"..\..\lib\sliced.lib"	

 # Begin Custom Build

 InputPath=..\..\slice\Ice\ProcessF.ice

 

@@ -1962,7 +1970,7 @@ SOURCE=..\..\slice\Ice\SliceChecksumDict.ice
 

 !IF  "$(CFG)" == "Ice - Win32 Release"

 

-USERDEP__IDENT="..\..\bin\slice2cpp.exe"	"..\..\lib\slice.lib"	

+USERDEP__SLICE="..\..\bin\slice2cpp.exe"	"..\..\lib\slice.lib"	

 # Begin Custom Build

 InputPath=..\..\slice\Ice\SliceChecksumDict.ice

 

@@ -1980,7 +1988,7 @@ BuildCmds= \
 

 !ELSEIF  "$(CFG)" == "Ice - Win32 Debug"

 

-USERDEP__IDENT="..\..\bin\slice2cpp.exe"	"..\..\lib\sliced.lib"	

+USERDEP__SLICE="..\..\bin\slice2cpp.exe"	"..\..\lib\sliced.lib"	

 # Begin Custom Build

 InputPath=..\..\slice\Ice\SliceChecksumDict.ice

 

@@ -2080,7 +2088,7 @@ SOURCE=..\..\slice\Ice\TransportInfo.ice
 

 !IF  "$(CFG)" == "Ice - Win32 Release"

 

-USERDEP__COMMU="..\..\bin\slice2cpp.exe"	"..\..\lib\slice.lib"	

+USERDEP__TRANS="..\..\bin\slice2cpp.exe"	"..\..\lib\slice.lib"	

 # Begin Custom Build

 InputPath=..\..\slice\Ice\TransportInfo.ice

 

@@ -2098,7 +2106,7 @@ BuildCmds= \
 

 !ELSEIF  "$(CFG)" == "Ice - Win32 Debug"

 

-USERDEP__COMMU="..\..\bin\slice2cpp.exe"	"..\..\lib\sliced.lib"	

+USERDEP__TRANS="..\..\bin\slice2cpp.exe"	"..\..\lib\sliced.lib"	

 # Begin Custom Build

 InputPath=..\..\slice\Ice\TransportInfo.ice

 

@@ -2123,7 +2131,7 @@ SOURCE=..\..\slice\Ice\TransportInfoF.ice
 

 !IF  "$(CFG)" == "Ice - Win32 Release"

 

-USERDEP__COMMUN="..\..\bin\slice2cpp.exe"	"..\..\lib\slice.lib"	

+USERDEP__TRANSP="..\..\bin\slice2cpp.exe"	"..\..\lib\slice.lib"	

 # Begin Custom Build

 InputPath=..\..\slice\Ice\TransportInfoF.ice

 

@@ -2136,7 +2144,7 @@ InputPath=..\..\slice\Ice\TransportInfoF.ice
 

 !ELSEIF  "$(CFG)" == "Ice - Win32 Debug"

 

-USERDEP__COMMUN="..\..\bin\slice2cpp.exe"	"..\..\lib\sliced.lib"	

+USERDEP__TRANSP="..\..\bin\slice2cpp.exe"	"..\..\lib\sliced.lib"	

 # Begin Custom Build

 InputPath=..\..\slice\Ice\TransportInfoF.ice

 

diff --git a/cpp/src/IceSSL/SslTransceiver.h b/cpp/src/IceSSL/SslTransceiver.h
index a14d5fb83f7..093753ad647 100644
--- a/cpp/src/IceSSL/SslTransceiver.h
+++ b/cpp/src/IceSSL/SslTransceiver.h
@@ -13,7 +13,7 @@
 #include <Ice/LoggerF.h>
 #include <Ice/StatsF.h>
 #include <Ice/Transceiver.h>
-#include <Ice/TransportInfo.h>
+#include <Ice/TransportInfoI.h>
 #include <Ice/Buffer.h>
 #include <IceUtil/Mutex.h>
 #include <IceSSL/SslTransceiverF.h>
@@ -220,7 +220,7 @@ protected:
 namespace IceSSL
 {
 
-class SslTransportInfoI : public Ice::TransportInfo
+class SslTransportInfoI : public Ice::TransportInfoI
 {
 public:
 
diff --git a/cpp/src/IceStorm/Flusher.cpp b/cpp/src/IceStorm/Flusher.cpp
index 673f112cdd1..79d06eb7f67 100644
--- a/cpp/src/IceStorm/Flusher.cpp
+++ b/cpp/src/IceStorm/Flusher.cpp
@@ -10,7 +10,6 @@
 #include <IceUtil/Thread.h>
 #include <IceUtil/Monitor.h>
 #include <Ice/Ice.h>
-#include <Ice/Functional.h>
 #include <IceStorm/Flushable.h>
 #include <IceStorm/TraceLevels.h>
 #include <IceStorm/Flusher.h>
diff --git a/cpp/src/IceStorm/TopicI.cpp b/cpp/src/IceStorm/TopicI.cpp
index e11733f72c0..76913cd14e5 100644
--- a/cpp/src/IceStorm/TopicI.cpp
+++ b/cpp/src/IceStorm/TopicI.cpp
@@ -8,7 +8,6 @@
 // **********************************************************************
 
 #include <Ice/Ice.h>
-#include <Ice/Functional.h>
 #include <IceStorm/TopicI.h>
 #include <IceStorm/SubscriberFactory.h>
 #include <IceStorm/Subscriber.h>
diff --git a/cpp/test/Ice/adapterDeactivation/AllTests.cpp b/cpp/test/Ice/adapterDeactivation/AllTests.cpp
index 58fd09951d9..3215011ac6b 100644
--- a/cpp/test/Ice/adapterDeactivation/AllTests.cpp
+++ b/cpp/test/Ice/adapterDeactivation/AllTests.cpp
@@ -28,7 +28,7 @@ allTests(const CommunicatorPtr& communicator)
     test(obj == base);
     cout << "ok" << endl;
 
-    cout << "creating, activating and deactivating a new object adapter in one operation... " << flush;
+    cout << "creating/activating/deactivating object adapter in one operation... " << flush;
     obj->transient();
     cout << "ok" << endl;