diff options
Diffstat (limited to 'cpp/src/Ice/ConnectionI.cpp')
| -rw-r--r-- | cpp/src/Ice/ConnectionI.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp index 7cd959f8500..9504acde619 100644 --- a/cpp/src/Ice/ConnectionI.cpp +++ b/cpp/src/Ice/ConnectionI.cpp @@ -148,12 +148,12 @@ Ice::ConnectionI::validate() } assert(is.i == is.b.end()); is.i = is.b.begin(); - ByteSeq m(sizeof(magic), 0); + pair<const Byte*, const Byte*> m; is.readBlob(m, static_cast<Int>(sizeof(magic))); - if(!equal(m.begin(), m.end(), magic)) + if(!equal(m.first, m.second, magic)) { BadMagicException ex(__FILE__, __LINE__); - ex.badMagic = m; + ex.badMagic = vector<Byte>(m.first, m.second); throw ex; } Byte pMajor; @@ -2359,12 +2359,12 @@ Ice::ConnectionI::run() ptrdiff_t pos = stream.i - stream.b.begin(); assert(pos >= headerSize); stream.i = stream.b.begin(); - ByteSeq m(sizeof(magic), 0); + pair<const Byte*, const Byte*> m; stream.readBlob(m, static_cast<Int>(sizeof(magic))); - if(!equal(m.begin(), m.end(), magic)) + if(!equal(m.first, m.second, magic)) { BadMagicException ex(__FILE__, __LINE__); - ex.badMagic = m; + ex.badMagic = vector<Byte>(m.first, m.second); throw ex; } Byte pMajor; |