summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/util/unicode.cpp
diff options
context:
space:
mode:
author Jean-François DEL NERO <jeanfrancoisdelnero@free.fr>2015-12-28 11:27:47 +0100
committer Jean-François DEL NERO <jeanfrancoisdelnero@free.fr>2015-12-28 11:27:47 +0100
commit2a5e044fc23624a388bdb5f82ef9c11cbed6a9c7 (patch)
treeb468f54cdcbb7252d14790a7a013b138b1bd9b03 /src/lib/util/unicode.cpp
parent077fe7ad89d65bbeafde141c9b3f71ca8df42f1c (diff)
parent11fcbaa28583023ea93a8f0c1f3fb9082d3295ab (diff)
Merge https://github.com/mamedev/mame
# Conflicts: # src/devices/video/ef9365.cpp
Diffstat (limited to 'src/lib/util/unicode.cpp')
-rw-r--r--src/lib/util/unicode.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/util/unicode.cpp b/src/lib/util/unicode.cpp
index 5f375337b34..e2c3956cedb 100644
--- a/src/lib/util/unicode.cpp
+++ b/src/lib/util/unicode.cpp
@@ -34,7 +34,7 @@ int uchar_from_utf8(unicode_char *uchar, const char *utf8char, size_t count)
char auxchar;
/* validate parameters */
- if (utf8char == NULL || count == 0)
+ if (utf8char == nullptr || count == 0)
return 0;
/* start with the first byte */
@@ -127,7 +127,7 @@ int uchar_from_utf16(unicode_char *uchar, const utf16_char *utf16char, size_t co
int rc = -1;
/* validate parameters */
- if (utf16char == NULL || count == 0)
+ if (utf16char == nullptr || count == 0)
return 0;
/* handle the two-byte case */