@@ -202,8 +202,8 @@ struct TestStringUtility
202202#pragma warning(push)
203203#pragma warning(disable : 4996)
204204#endif
205- return static_cast <CharType*>(:: memcpy (dest, src,
206- ( UnsafeLength ( src) + 1 ) * sizeof (CharType) ));
205+ size_t copy_size = static_cast <size_t >(( UnsafeLength ( src) + 1 ) * sizeof (CharType));
206+ return static_cast <CharType*>(:: memcpy (dest, src, copy_size ));
207207#ifdef _MSC_VER
208208#pragma warning(pop)
209209#endif
@@ -252,7 +252,7 @@ struct TestStringUtility
252252 template <typename CharType>
253253 static void Allocate (CharType*& dest, size_type dest_len)
254254 {
255- dest = TestMemoryUtility<CharType>::Allocate (dest_len + 1 );
255+ dest = TestMemoryUtility<CharType, size_type >::Allocate (dest_len + 1 );
256256 }
257257
258258 template <typename CharType>
@@ -275,7 +275,7 @@ struct TestStringUtility
275275 {
276276 if ((src != NULL ) && (src_len > 0 ))
277277 {
278- dest = TestMemoryUtility<CharType>::UnsafeAllocateCopy (src, src_len + 1 );
278+ dest = TestMemoryUtility<CharType, size_type >::UnsafeAllocateCopy (src, src_len + 1 );
279279 if (dest != NULL )
280280 {
281281 dest_len = src_len;
@@ -314,7 +314,7 @@ struct TestStringUtility
314314 CharType const * src,
315315 size_type src_len)
316316 {
317- dest = TestMemoryUtility<CharType>::UnsafeAllocateCopy (src, src_len + 1 );
317+ dest = TestMemoryUtility<CharType, size_type >::UnsafeAllocateCopy (src, src_len + 1 );
318318 dest_len = (dest != NULL ) ? src_len : static_cast <size_type>(0 );
319319 }
320320
@@ -351,7 +351,7 @@ struct TestStringUtility
351351 }
352352 else
353353 {
354- ::memcpy (dest, src, dest_len + 1 );
354+ ::memcpy (dest, src, static_cast < size_t >( dest_len + 1 ) );
355355 dest_len = len;
356356 }
357357 }
@@ -387,14 +387,14 @@ struct TestStringUtility
387387 if (new_dest != NULL )
388388 {
389389 if ((str1 != NULL ) && (str1_len > static_cast <size_type>(0 )))
390- ::memcpy (new_dest, str1, str1_len);
390+ ::memcpy (new_dest, str1, static_cast < size_t >( str1_len) );
391391 else
392392 {
393393 new_len -= str1_len;
394394 str1_len = static_cast <size_type>(0 );
395395 }
396396 if ((str2 != NULL ) && (str2_len > static_cast <size_type>(0 )))
397- ::memcpy (new_dest + str1_len, str2, str2_len);
397+ ::memcpy (new_dest + str1_len, str2, static_cast < size_t >( str2_len) );
398398 else
399399 new_len -= str2_len;
400400 SetNullChar (*(new_dest + new_len));
0 commit comments