]> git.saurik.com Git - wxWidgets.git/commitdiff
use memcpy() instead of wxTmemcpy() as the latter is defined in wx/wxcrt.h which...
authorVadim Zeitlin <vadim@wxwidgets.org>
Sat, 7 Jun 2008 15:12:23 +0000 (15:12 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Sat, 7 Jun 2008 15:12:23 +0000 (15:12 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54017 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/string.h

index aaa1581d9d3ab97fb644ce2832f90ec763a0330e..ce69cb8026b0808aa02a0a9a49d36e7a8c2f1dba 100644 (file)
@@ -2895,7 +2895,7 @@ public:
                 len = lenWanted - 1;
             }
 
-            wxTmemcpy(m_buf.data(), buf, len + 1);
+            memcpy(m_buf.data(), buf, (len + 1)*sizeof(CharType));
         }
         //else: conversion failed, this can happen when trying to get Unicode
         //      string contents into a char string