diff --git a/qse/include/qse/sed/sed.h b/qse/include/qse/sed/sed.h index 7a81ec58..bb3e83cc 100644 --- a/qse/include/qse/sed/sed.h +++ b/qse/include/qse/sed/sed.h @@ -61,7 +61,7 @@ typedef struct qse_sed_t qse_sed_t; enum qse_sed_errnum_t { QSE_SED_ENOERR, /**< no error */ - QSE_SED_ENOMEM, /**< out of memory */ + QSE_SED_ENOMEM, /**< insufficient memory */ QSE_SED_ECMDNR, /**< command '${0}' not recognized */ QSE_SED_ECMDMS, /**< command code missing */ QSE_SED_ECMDIC, /**< command '${0}' incomplete */ diff --git a/qse/lib/sed/sed.c b/qse/lib/sed/sed.c index b6d68af6..779cb370 100644 --- a/qse/lib/sed/sed.c +++ b/qse/lib/sed/sed.c @@ -44,7 +44,7 @@ static const qse_char_t* dflerrstr (qse_sed_t* sed, qse_sed_errnum_t errnum) static const qse_char_t* errstr[] = { QSE_T("no error"), - QSE_T("out of memory"), + QSE_T("insufficient memory"), QSE_T("command '${0}' not recognized"), QSE_T("command code missing"), QSE_T("command '${0}' incomplete"), diff --git a/qse/test/sed/sed03.cpp b/qse/test/sed/sed03.cpp index 6136f4ef..5cdcbc5a 100644 --- a/qse/test/sed/sed03.cpp +++ b/qse/test/sed/sed03.cpp @@ -22,6 +22,12 @@ #include #include +#ifdef QSE_CHAR_IS_MCHAR +# define xcout std::cout +#else +# define xcout std::wcout +#endif + typedef std::basic_string xstring; typedef QSE::StdSed StdSed; // added for doxygen cross-reference @@ -108,11 +114,11 @@ int sed_main (int argc, qse_char_t* argv[]) sed.run ( QSE_T("y/ABC/abc/;s/abc/def/g"), QSE_T("ABCDEFabcdef"), out); - std::cout << QSE_T("OUTPUT: ") << out << std::endl; + xcout << QSE_T("OUTPUT: ") << out << std::endl; } catch (MySed::Error& err) { - std::cout << QSE_T("ERROR: ") << err.getMessage() << std::endl; + xcout << QSE_T("ERROR: ") << err.getMessage() << std::endl; return -1; }