diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2006-02-24 16:06:33 +0000 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2006-02-24 16:06:33 +0000 |
| commit | b47f0b9870ad506ba7a4b5dabcea6fca714c3df8 (patch) | |
| tree | 2382ac1783759dc0b7ec0c8202247636a1f1fe5b /cpp/src/Ice/ThreadPool.cpp | |
| parent | Fix (diff) | |
| download | ice-b47f0b9870ad506ba7a4b5dabcea6fca714c3df8.tar.bz2 ice-b47f0b9870ad506ba7a4b5dabcea6fca714c3df8.tar.xz ice-b47f0b9870ad506ba7a4b5dabcea6fca714c3df8.zip | |
Changed blob functions to match IceE
Diffstat (limited to 'cpp/src/Ice/ThreadPool.cpp')
| -rw-r--r-- | cpp/src/Ice/ThreadPool.cpp | 6 |
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; |