diff options
Diffstat (limited to 'cpp/src/Ice/BasicStream.cpp')
| -rw-r--r-- | cpp/src/Ice/BasicStream.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cpp/src/Ice/BasicStream.cpp b/cpp/src/Ice/BasicStream.cpp index b3db534f578..eff688936a3 100644 --- a/cpp/src/Ice/BasicStream.cpp +++ b/cpp/src/Ice/BasicStream.cpp @@ -22,6 +22,7 @@ #include <Ice/LocalException.h> #include <Ice/Protocol.h> #include <Ice/FactoryTable.h> +#include <Ice/TraceUtil.h> template<typename InputIter, typename OutputIter> void @@ -45,8 +46,6 @@ using namespace std; using namespace Ice; using namespace IceInternal; -const string IceInternal::BasicStream::_userExceptionId("::Ice::UserException"); - IceInternal::BasicStream::BasicStream(Instance* instance) : _instance(instance), _currentReadEncaps(0), @@ -1087,7 +1086,7 @@ IceInternal::BasicStream::read(PatchFunc patchFunc, void* patchAddr) } assert(index > 0); - while(1) + while(true) { string id; readTypeId(id); @@ -1113,6 +1112,7 @@ IceInternal::BasicStream::read(PatchFunc patchFunc, void* patchAddr) } if(!v) { + traceSlicing("class", id, _instance->logger(), _instance->traceLevels()); skipSlice(); // Slice off this derived part -- we don't understand it. continue; } @@ -1180,6 +1180,7 @@ IceInternal::BasicStream::throwException() } else { + traceSlicing("exception", id, _instance->logger(), _instance->traceLevels()); skipSlice(); // Slice off what we don't understand read(id); // Read type id for next slice } |