Merge branch 'release'

naterichman · Mar 30, 2023 · f7816ee · f7816ee
2 parents bea26dd + 8baa5d8
commit f7816ee
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Source/Common/CMakeLists.txt b/Source/Common/CMakeLists.txt
@@ -62,7 +62,7 @@ CHECK_CXX_SOURCE_COMPILES(
   "int main() { const char *f = __FUNCTION__; return 0;}"
   GDCM_CXX_HAS_FUNCTION)
 CHECK_CXX_SOURCE_COMPILES(
-  "\#include <fstream>\nint main() { const wchar_t fn[10] = {}; std::ifstream is( fn ); return 0;}"
+  "\#include <fstream>\nint main() { const wchar_t fn[10] = {}; std::ifstream is( fn ); std::wcerr << fn; return 0;}"
   GDCM_HAVE_WCHAR_IFSTREAM)
 CHECK_CXX_SOURCE_COMPILES(
   "\#include <string>\n#include <codecvt>\n#include <locale>\nint main() { std::u16string u16; std::string utf8 = std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t>{}.to_bytes(u16); }"

diff --git a/Testing/Source/Common/Cxx/TestFilename.cxx b/Testing/Source/Common/Cxx/TestFilename.cxx
@@ -98,7 +98,7 @@ int TestFilename(int argc, char *argv[])
   std::ofstream outputFileStream( fn );
   if ( ! outputFileStream.is_open() )
     {
-    std::cerr << "Failed to read UTF-16: " << fn << std::endl;
+    std::wcerr << "Failed to read UTF-16: " << fn << std::endl;
     return EXIT_FAILURE;
     }
   outputFileStream.close();