Merge "Add guards to prevent typedefs when C++11 is available."

2014-04-07 21:54:26 +00:00 · 2014-04-07 21:54:26 +00:00 · 3163186164
parent 6b91fefdb2 ae83f84548
commit 3163186164
1 changed files with 3 additions and 0 deletions
--- a/include/utils/Unicode.h
+++ b/include/utils/Unicode.h
@ -22,8 +22,11 @@

 extern "C" {

+// Definitions exist in C++11
+#if defined __cplusplus && __cplusplus < 201103L
 typedef uint32_t char32_t;
 typedef uint16_t char16_t;
+#endif

 // Standard string functions on char16_t strings.
 int strcmp16(const char16_t *, const char16_t *);