Micgrier/strings

src/Windows/libraries/windows_strings/src/char16_to_char.cpp

@@ -7,6 +7,16 @@
 
 namespace m
 {
+    std::string
+    string_converter<char16_t const*, std::string>::make_string(cu16zstring str)
+    {
+        if (str == nullptr)
+            return std::string();
+
+        return string_converter<std::u16string_view, std::string>::make_string(
+            std::u16string_view(str));
+    }
+
     std::string
     string_converter<std::u16string_view, std::string>::make_string(std::u16string_view v)
     {

src/Windows/libraries/windows_strings/src/wchar_to_char.cpp

@@ -7,6 +7,12 @@
 
 namespace m
 {
+    std::string
+    string_converter<wchar_t const*, std::string>::make_string(cwzstring str)
+    {
+        return string_converter<std::wstring_view, std::string>::make_string(view_of(str));
+    }
+
     std::string
     string_converter<std::wstring_view, std::string>::make_string(std::wstring_view v)
     {

src/Windows/libraries/windows_strings/src/wchar_to_char16.cpp

@@ -38,7 +38,11 @@ namespace m
     std::u16string
     string_converter<wchar_t const*, std::u16string>::make_string(cwzstring str)
     {
-        return std::u16string(std::u16string_view(reinterpret_cast<char16_t const*>(str)));
+        if (str == nullptr)
+            return std::u16string();
+
+        return string_converter<std::wstring_view, std::u16string>::make_string(
+            std::wstring_view(str));
     }
 
     std::optional<std::u16string>

src/libraries/Platform-Adaptive/strings/CMakeLists.txt

@@ -6,9 +6,8 @@ target_compile_features(m_platform_adaptive_strings PUBLIC ${M_CXX_STD})
 
 add_subdirectory(include)
 add_subdirectory(src)
-# add_subdirectory(test)
 if(BUILD_TESTING)
-# add_subdirectory(test)
+    add_subdirectory(test)
 endif()
 
 list(APPEND m_installation_targets

src/libraries/Platform-Adaptive/strings/test/CMakeLists.txt

@@ -0,0 +1,24 @@
+cmake_minimum_required(VERSION 3.23)
+
+project(m)
+
+include(GoogleTest)
+
+set(TEST_EXE_NAME test_platform_adaptive_strings)
+
+add_executable(${TEST_EXE_NAME}
+    test_platform_adaptive_strings.cpp
+)
+
+target_compile_features(${TEST_EXE_NAME} PUBLIC ${M_CXX_STD})
+
+target_link_libraries(${TEST_EXE_NAME}
+    m_platform_adaptive_strings
+    GTest::gtest_main
+)
+
+enable_testing()
+
+if(DISCOVER_TESTS)
+    gtest_discover_tests(${TEST_EXE_NAME})
+endif()