4 files changed, 14 insertions, 8 deletions
diff --git a/cpp/doc/Properties.sgml b/cpp/doc/Properties.sgml
index 3122931b37b..fd49c07e9c9 100644
--- a/cpp/doc/Properties.sgml
+++ b/cpp/doc/Properties.sgml
@@ -115,6 +115,8 @@ The request retry trace level:
 </section>
 </section>
 
+<!-- 
+
 <section><title>Ice.Trace.Slicing</title>
 <section><title>Synopsis</title>
 <synopsis>
@@ -143,6 +145,8 @@ The slicing trace level:
 </section>
 </section>
 
+-->
+
 </section>
 
 <!-- ********************************************************************** -->
diff --git a/cpp/src/Ice/BasicStream.cpp b/cpp/src/Ice/BasicStream.cpp
index eff688936a3..15ba127896f 100644
--- a/cpp/src/Ice/BasicStream.cpp
+++ b/cpp/src/Ice/BasicStream.cpp
@@ -1112,7 +1112,7 @@ IceInternal::BasicStream::read(PatchFunc patchFunc, void* patchAddr)
 	    }
 	    if(!v)
 	    {
-		traceSlicing("class", id, _instance->logger(), _instance->traceLevels());
+//		traceSlicing("class", id, _instance->logger(), _instance->traceLevels());
 		skipSlice();	// Slice off this derived part -- we don't understand it.
 		continue;
 	    }
@@ -1180,7 +1180,7 @@ IceInternal::BasicStream::throwException()
 	}
 	else
 	{
-	    traceSlicing("exception", id, _instance->logger(), _instance->traceLevels());
+//	    traceSlicing("exception", id, _instance->logger(), _instance->traceLevels());
 	    skipSlice();	// Slice off what we don't understand
 	    read(id);		// Read type id for next slice
 	}
diff --git a/cpp/src/Ice/TraceUtil.cpp b/cpp/src/Ice/TraceUtil.cpp
index 752e1ae1aec..798e1c25dc1 100644
--- a/cpp/src/Ice/TraceUtil.cpp
+++ b/cpp/src/Ice/TraceUtil.cpp
@@ -184,7 +184,7 @@ printHeader(ostream& s, BasicStream& stream)
 }
 
 void
-IceInternal::traceHeader(const char* heading, const BasicStream& str, const ::Ice::LoggerPtr& logger,
+IceInternal::traceHeader(const char* heading, const BasicStream& str, const LoggerPtr& logger,
 			 const TraceLevelsPtr& tl)
 {
     if(tl->protocol >= 1)
@@ -203,7 +203,7 @@ IceInternal::traceHeader(const char* heading, const BasicStream& str, const ::Ic
 }
 
 void
-IceInternal::traceRequest(const char* heading, const BasicStream& str, const ::Ice::LoggerPtr& logger,
+IceInternal::traceRequest(const char* heading, const BasicStream& str, const LoggerPtr& logger,
 			  const TraceLevelsPtr& tl)
 {
     if(tl->protocol >= 1)
@@ -232,7 +232,7 @@ IceInternal::traceRequest(const char* heading, const BasicStream& str, const ::I
 }
 
 void
-IceInternal::traceBatchRequest(const char* heading, const BasicStream& str, const ::Ice::LoggerPtr& logger,
+IceInternal::traceBatchRequest(const char* heading, const BasicStream& str, const LoggerPtr& logger,
 			       const TraceLevelsPtr& tl)
 {
     if(tl->protocol >= 1)
@@ -262,7 +262,7 @@ IceInternal::traceBatchRequest(const char* heading, const BasicStream& str, cons
 }
 
 void
-IceInternal::traceReply(const char* heading, const BasicStream& str, const ::Ice::LoggerPtr& logger,
+IceInternal::traceReply(const char* heading, const BasicStream& str, const LoggerPtr& logger,
 			const TraceLevelsPtr& tl)
 {
     if(tl->protocol >= 1)
@@ -380,12 +380,13 @@ IceInternal::traceReply(const char* heading, const BasicStream& str, const ::Ice
     }
 }
 
+/*
 static IceUtil::StaticMutex slicingMutex;
 static set<string> slicingIds;
 
 void
 IceInternal::traceSlicing(const char* kind, const string& typeId,
-	                  const ::Ice::LoggerPtr& logger, const TraceLevelsPtr& tl)
+	                  const LoggerPtr& logger, const TraceLevelsPtr& tl)
 {
     if(tl->slicing >= 1)
     {
@@ -399,3 +400,4 @@ IceInternal::traceSlicing(const char* kind, const string& typeId,
 	}
     }
 }
+*/
diff --git a/cpp/src/Ice/TraceUtil.h b/cpp/src/Ice/TraceUtil.h
index cc02e572731..2a0039c5c2c 100644
--- a/cpp/src/Ice/TraceUtil.h
+++ b/cpp/src/Ice/TraceUtil.h
@@ -27,7 +27,7 @@ void traceHeader(const char*, const BasicStream&, const ::Ice::LoggerPtr&, const
 void traceRequest(const char*, const BasicStream&, const ::Ice::LoggerPtr&, const TraceLevelsPtr&);
 void traceBatchRequest(const char*, const BasicStream&, const ::Ice::LoggerPtr&, const TraceLevelsPtr&);
 void traceReply(const char*, const BasicStream&, const ::Ice::LoggerPtr&, const TraceLevelsPtr&);
-void traceSlicing(const char*, const ::std::string&, const ::Ice::LoggerPtr&, const TraceLevelsPtr&);
+//void traceSlicing(const char*, const ::std::string&, const ::Ice::LoggerPtr&, const TraceLevelsPtr&);
 
 }