summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2013-02-28 19:26:54 +0000
committerGeorge Hazan <george.hazan@gmail.com>2013-02-28 19:26:54 +0000
commit9060bf2b23f86be8eaecbdc90262a8d1c0e7b374 (patch)
tree4a4e135eeff281816682b8ea13f09845d6bd9f80 /include
parent7fd3863d1a8da7ad32f44762792c1df82eebf5bf (diff)
compilation fixes
git-svn-id: http://svn.miranda-ng.org/main/trunk@3809 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'include')
-rw-r--r--include/m_system_cpp.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/include/m_system_cpp.h b/include/m_system_cpp.h
index 2cb5a5af5e..600eefe01f 100644
--- a/include/m_system_cpp.h
+++ b/include/m_system_cpp.h
@@ -27,14 +27,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "m_system.h"
-#if defined(_UNICODE)
- #define tstring wstring
-#else
- #define tstring string
-#endif
-
#if defined(__cplusplus)
+#if defined(_STRING_)
+namespace std
+{
+ typedef basic_string<TCHAR, char_traits<TCHAR>, allocator<TCHAR> > tstring;
+}
+#endif
+
///////////////////////////////////////////////////////////////////////////////
// mir_ptr - automatic pointer for buffers, allocated using mir_alloc/mir_calloc