From a9d5a27d4327a3ca25e6f53a1900c9af93e604e8 Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Tue, 18 Sep 2018 09:15:31 +0000 Subject: [PATCH] fixed more flaws in the sample programs --- qse/samples/awk/awk22.cpp | 4 +++- qse/samples/awk/awk23.cpp | 4 +++- qse/samples/awk/awk28.cpp | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/qse/samples/awk/awk22.cpp b/qse/samples/awk/awk22.cpp index a8285b54..79a69bf1 100644 --- a/qse/samples/awk/awk22.cpp +++ b/qse/samples/awk/awk22.cpp @@ -2,7 +2,9 @@ #include #include -#if defined(QSE_CHAR_IS_WCHAR) +#if defined(QSE_CHAR_IS_WCHAR) && defined(QSE_WCHAR_IS_CHAR16_T) +typedef std::basic_string String; +#elif defined(QSE_CHAR_IS_WCHAR) typedef std::wstring String; #else typedef std::string String; diff --git a/qse/samples/awk/awk23.cpp b/qse/samples/awk/awk23.cpp index fa0340cc..45e4f15f 100644 --- a/qse/samples/awk/awk23.cpp +++ b/qse/samples/awk/awk23.cpp @@ -2,7 +2,9 @@ #include #include -#if defined(QSE_CHAR_IS_WCHAR) +#if defined(QSE_CHAR_IS_WCHAR) && defined(QSE_WCHAR_IS_CHAR16_T) +typedef std::basic_string String; +#elif defined(QSE_CHAR_IS_WCHAR) typedef std::wstring String; #else typedef std::string String; diff --git a/qse/samples/awk/awk28.cpp b/qse/samples/awk/awk28.cpp index e308b78e..44d8a2f1 100644 --- a/qse/samples/awk/awk28.cpp +++ b/qse/samples/awk/awk28.cpp @@ -36,7 +36,9 @@ #endif #include -#if defined(QSE_CHAR_IS_WCHAR) +#if defined(QSE_CHAR_IS_WCHAR) && defined(QSE_WCHAR_IS_CHAR16_T) +typedef std::basic_string String; +#elif defined(QSE_CHAR_IS_WCHAR) typedef std::wstring String; #else typedef std::string String;