Add MSVC support

patrickroberts · Jan 12, 2025 · d3af2bd · d3af2bd
1 parent 88bda2e
commit d3af2bd
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 10 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -21,13 +21,18 @@ add_library(patrickroberts INTERFACE)
 target_compile_features(patrickroberts INTERFACE cxx_std_23)
 target_compile_options(
   patrickroberts
-  INTERFACE
-    -Wall
-    -Werror
-    -Wextra
-    -pedantic
-    $<$<CXX_COMPILER_ID:Clang>:$<$<BOOL:${PATRICK_ROBERTS_USE_LIBCXX}>:-stdlib=libc++>
-    -D_GLIBCXX_DO_NOT_USE_BUILTIN_TRAITS>)
+  INTERFACE $<$<CXX_COMPILER_ID:MSVC>:
+            /W4
+            /WX
+            /std:c++latest>
+            $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:
+            -Wall
+            -Werror
+            -Wextra
+            -pedantic>
+            $<$<CXX_COMPILER_ID:Clang>:
+            $<$<BOOL:${PATRICK_ROBERTS_USE_LIBCXX}>:-stdlib=libc++>
+            -D_GLIBCXX_DO_NOT_USE_BUILTIN_TRAITS>)
 target_include_directories(patrickroberts
                            INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/include")
 

diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ static_assert([] {
 ```
 
 ## Features:
-- C++23 implementation (uses `if consteval`, `std::unreachable()`, and `auto`-cast)
+- C++23 implementation
 - Fully constexpr and SFINAE-friendly
 - Supports:
   * Ranges of any iterator category including `contiguous_range<R>`

diff --git a/cmake/pre-commit.cmake b/cmake/pre-commit.cmake
@@ -3,6 +3,10 @@ find_package(Python3 REQUIRED COMPONENTS Interpreter)
 set(VIRTUAL_ENV "${PROJECT_SOURCE_DIR}/.venv")
 set(VIRTUAL_ENV_BIN "${VIRTUAL_ENV}/bin")
 
+if(WIN32)
+  set(VIRTUAL_ENV_BIN "${VIRTUAL_ENV}/Scripts")
+endif()
+
 if(NOT EXISTS "${VIRTUAL_ENV}")
   execute_process(COMMAND "${Python3_EXECUTABLE}" -m venv "${VIRTUAL_ENV}"
                           COMMAND_ERROR_IS_FATAL ANY)

diff --git a/include/pr/any_iterator.hpp b/include/pr/any_iterator.hpp
@@ -54,7 +54,8 @@ class any_iterator : public detail::iterator_concept_trait<KindV> {
   template <class IteratorT, class SentinelT>
   constexpr any_iterator(IteratorT &&iterator, SentinelT &&sentinel)
       : iterator_ptr_(in_place_iterator_type_<IteratorT, SentinelT>,
-                      auto(iterator), auto(sentinel)) {}
+                      static_cast<std::decay_t<IteratorT>>(iterator),
+                      static_cast<std::decay_t<SentinelT>>(sentinel)) {}
 
   any_iterator() = delete;
 

diff --git a/include/pr/detail/intrusive_small_ptr.hpp b/include/pr/detail/intrusive_small_ptr.hpp
@@ -34,7 +34,7 @@ class intrusive_small_ptr {
     if constexpr (sizeof(AdaptorT) <= sizeof(InplaceT) and
                   alignof(AdaptorT) <= alignof(InplaceT)) {
       // placement new is not allowed in a constant expression
-      if not consteval {
+      if (not std::is_constant_evaluated()) {
         ::new (&inplace_) AdaptorT(static_cast<ArgsT &&>(args)...);
         index_ = index_type::is_inplace;
         return;

diff --git a/include/pr/detail/iterator_interface.hpp b/include/pr/detail/iterator_interface.hpp
@@ -2,6 +2,8 @@
 
 #include <pr/detail/intrusive_small_ptr.hpp>
 
+#include <typeinfo>
+
 namespace pr::detail {
 
 template <class ElementT, any_kind KindV, class ReferenceT, class DifferenceT>