summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/ThreadPool.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/Ice/ThreadPool.cpp')
-rw-r--r--cpp/src/Ice/ThreadPool.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Ice/ThreadPool.cpp b/cpp/src/Ice/ThreadPool.cpp
index 15bda6f74fe..627c2a943da 100644
--- a/cpp/src/Ice/ThreadPool.cpp
+++ b/cpp/src/Ice/ThreadPool.cpp
@@ -763,12 +763,12 @@ IceInternal::ThreadPool::read(const EventHandlerPtr& handler)
throw IllegalMessageSizeException(__FILE__, __LINE__);
}
stream.i = stream.b.begin();
- pair<const Byte*, const Byte*> m;
+ const Byte* m;
stream.readBlob(m, static_cast<Int>(sizeof(magic)));
- if(!equal(m.first, m.second, magic))
+ if(m[0] != magic[0] || m[1] != magic[1] || m[2] != magic[2] || m[3] != magic[3])
{
BadMagicException ex(__FILE__, __LINE__);
- ex.badMagic = vector<Byte>(m.first, m.second);
+ ex.badMagic = Ice::ByteSeq(&m[0], &m[0] + sizeof(magic));
throw ex;
}
Byte pMajor;