work

ndsev · Apr 19, 2024 · ee82a90 · ee82a90
1 parent 1ce9881
commit ee82a90
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/build_windows_cpp.yml b/.github/workflows/build_windows_cpp.yml
@@ -21,9 +21,8 @@ jobs:
         - { os: "windows-2022", mingw-version: "9.4.0", cxx-standard: "11", build-type: "Release" }
         - { os: "windows-2022", mingw-version: "9.4.0", cxx-standard: "11", build-type: "Debug" }
 
-        # enable it when https://github.com/ndsev/zserio/issues/596 is fixed
-        #- { os: "windows-2022", msvc-toolset: "v142", cxx-standard: "17", build-type: "Release" }
-        #- { os: "windows-2022", msvc-toolset: "v142", cxx-standard: "17", build-type: "Debug" }
+        - { os: "windows-2022", msvc-toolset: "v142", cxx-standard: "17", build-type: "Release" }
+        - { os: "windows-2022", msvc-toolset: "v142", cxx-standard: "17", build-type: "Debug" }
 
         - { os: "windows-2022", mingw-version: "9.4.0", cxx-standard: "17", build-type: "Release" }
         - { os: "windows-2022", mingw-version: "9.4.0", cxx-standard: "17", build-type: "Debug" }

diff --git a/compiler/extensions/cpp/runtime/test/zserio/AllocatorPropagatingCopyTest.cpp b/compiler/extensions/cpp/runtime/test/zserio/AllocatorPropagatingCopyTest.cpp
@@ -5,6 +5,7 @@
 #include "zserio/AnyHolder.h"
 #include "zserio/NoInit.h"
 #include "zserio/OptionalHolder.h"
+#include "zserio/String.h"
 
 #include "TrackingAllocator.h"
 
@@ -307,10 +308,10 @@ TEST(AllocatorPropagatingCopyTest, copyVectorRegular)
 TEST(AllocatorPropagatingCopyTest, copyString)
 {
     RegularWithAllocatorSupport::allocator_type allocator;
-
-    const std::basic_string<char, std::char_traits<char>, RegularWithAllocatorSupport::allocator_type>
+    
+    const zserio::string<RegularWithAllocatorSupport::allocator_type> 
             emptyString(allocator);
-    std::basic_string<char, std::char_traits<char>, RegularWithAllocatorSupport::allocator_type>
+    zserio::string<RegularWithAllocatorSupport::allocator_type>
             emptyStringCopy(allocatorPropagatingCopy(emptyString, allocator));
     ASSERT_EQ(emptyString.get_allocator(), emptyStringCopy.get_allocator());
 }

diff --git a/compiler/extensions/cpp/runtime/test/zserio/TrackingAllocator.h b/compiler/extensions/cpp/runtime/test/zserio/TrackingAllocator.h
@@ -61,7 +61,7 @@ class TrackingAllocatorImpl
 {
 public:
     using value_type = typename std::allocator<T>::value_type;
-    using pointer = typename std::allocator<T>::pointer;
+    using pointer = typename std::allocator_traits<std::allocator<T>>::pointer;
 
     TrackingAllocatorImpl() :
             m_tracker(std::make_shared<detail::AllocationTracker>())