summaryrefslogtreecommitdiff
path: root/ace
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2001-12-05 08:23:23 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2001-12-05 08:23:23 +0000
commita3ec0edc44dfcdad26a44f922cdb770ddaa92acd (patch)
treef601e50d66013fdbc323eef346dd8c91b79b810a /ace
parentd16c84c47bf4e644cc63607145a75ac99c8105a1 (diff)
downloadATCD-a3ec0edc44dfcdad26a44f922cdb770ddaa92acd.tar.gz
ChangeLogTag: Tue Dec 05 09:19:08 2001 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'ace')
-rw-r--r--ace/SString.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/ace/SString.cpp b/ace/SString.cpp
index 5129db623b1..68c10cbcf0b 100644
--- a/ace/SString.cpp
+++ b/ace/SString.cpp
@@ -331,7 +331,7 @@ ACE_NS_WString::ACE_NS_WString (const char *s,
#if defined (ACE_WSTRING_HAS_USHORT_SUPPORT)
ACE_NS_WString::ACE_NS_WString (const ACE_USHORT16 *s,
size_t len,
- ACE_Allocator *alloc = 0)
+ ACE_Allocator *alloc)
: ACE_WString (alloc)
{
if (s == 0)
@@ -347,7 +347,7 @@ ACE_NS_WString::ACE_NS_WString (const ACE_USHORT16 *s,
this->allocator_->malloc ((this->buf_len_) *
sizeof (ACE_WSTRING_TYPE)));
this->release_ = 1;
- for (int i = 0; i <= this->buf_len_; i++)
+ for (size_t i = 0; i <= this->buf_len_; i++)
this->rep_[i] = s[i];
}
#endif /* ACE_WSTRING_HAS_USHORT_SUPPORT */