summaryrefslogtreecommitdiff
path: root/cppe/src/IceE/BasicStream.cpp
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2006-05-01 19:15:04 +0000
committerDwayne Boone <dwayne@zeroc.com>2006-05-01 19:15:04 +0000
commit69fd2c32d9e8e51e69801d701a274dca176dd9ff (patch)
tree73cf565d158021303be02c9cc5c0fcb25005db25 /cppe/src/IceE/BasicStream.cpp
parentFixed W32 compile (diff)
downloadice-69fd2c32d9e8e51e69801d701a274dca176dd9ff.tar.bz2
ice-69fd2c32d9e8e51e69801d701a274dca176dd9ff.tar.xz
ice-69fd2c32d9e8e51e69801d701a274dca176dd9ff.zip
Fixed W32 compiles for string converters
Diffstat (limited to 'cppe/src/IceE/BasicStream.cpp')
-rw-r--r--cppe/src/IceE/BasicStream.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/cppe/src/IceE/BasicStream.cpp b/cppe/src/IceE/BasicStream.cpp
index 611f9bc9b78..63c9fd38b34 100644
--- a/cppe/src/IceE/BasicStream.cpp
+++ b/cppe/src/IceE/BasicStream.cpp
@@ -1326,14 +1326,14 @@ IceInternal::BasicStream::writeConverted(const string& v)
// Use memmove instead of memcpy since the source and destination typically overlap.
//
resize(b.size() + 4);
- std::memmove(b.begin() + firstIndex + 4, b.begin() + firstIndex, actualSize);
+ memmove(b.begin() + firstIndex + 4, b.begin() + firstIndex, actualSize);
}
else if(guessedSize > 254 && actualSize <= 254)
{
//
// Move the UTF-8 sequence 4 bytes back
//
- std::memmove(b.begin() + firstIndex - 4, b.begin() + firstIndex, actualSize);
+ memmove(b.begin() + firstIndex - 4, b.begin() + firstIndex, actualSize);
resize(b.size() - 4);
}
@@ -1421,14 +1421,14 @@ IceInternal::BasicStream::writeConverted(const wstring& v)
// Use memmove instead of memcpy since the source and destination typically overlap.
//
resize(b.size() + 4);
- std::memmove(b.begin() + firstIndex + 4, b.begin() + firstIndex, actualSize);
+ memmove(b.begin() + firstIndex + 4, b.begin() + firstIndex, actualSize);
}
else if(guessedSize > 254 && actualSize <= 254)
{
//
// Move the UTF-8 sequence 4 bytes back
//
- std::memmove(b.begin() + firstIndex - 4, b.begin() + firstIndex, actualSize);
+ memmove(b.begin() + firstIndex - 4, b.begin() + firstIndex, actualSize);
resize(b.size() - 4);
}