From 39329d2edd5f6948474369e898b74d836538cf49 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 7 Jun 2008 15:12:23 +0000 Subject: [PATCH] use memcpy() instead of wxTmemcpy() as the latter is defined in wx/wxcrt.h which includes wx/string.h and hence can't be used from here git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54017 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/string.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wx/string.h b/include/wx/string.h index aaa1581d9d..ce69cb8026 100644 --- a/include/wx/string.h +++ b/include/wx/string.h @@ -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