Merge pull request #33 from aescande/topic/msvc

jcarpent · web-flow · commit 81c2ad4f8249 · 2022-10-05T17:59:51.000+02:00
Compilation MSVC
diff --git a/include/proxsuite/linalg/veg/internal/fix_index.hpp b/include/proxsuite/linalg/veg/internal/fix_index.hpp
@@ -328,12 +328,10 @@ namespace adl {
 
 inline namespace literals {
 template<char... Chars>
-VEG_INLINE constexpr auto operator"" _c()
-  VEG_NOEXCEPT->Fix<_detail::parse_int(_detail::char_seq<Chars...>::value,
-                                       sizeof...(Chars),
-                                       _detail::Error{})>
+VEG_INLINE constexpr auto operator"" _c() VEG_NOEXCEPT
 {
-  return {};
+  return Fix<_detail::parse_int(
+    _detail::char_seq<Chars...>::value, sizeof...(Chars), _detail::Error{})>{};
 }
 } // namespace literals
 } // namespace veg
diff --git a/include/proxsuite/linalg/veg/internal/macros.hpp b/include/proxsuite/linalg/veg/internal/macros.hpp
@@ -335,12 +335,13 @@
   noexcept->::proxsuite::linalg::veg::meta::true_type
 
 #define __VEG_IMPL_SFINAE(_, Param)                                            \
-  , ::proxsuite::linalg::veg::meta::enable_if_t<__VEG_PP_UNWRAP Param, int> = 0
+  , ::proxsuite::linalg::veg::meta::                                           \
+      enable_if_t<__VEG_PP_ID(__VEG_PP_UNWRAP Param), int> = 0
 
 #define __VEG_IMPL_OVERLOAD(Name_Tpl, Param)                                   \
   template<__VEG_PP_REMOVE_PAREN(__VEG_PP_TAIL Name_Tpl),                      \
            typename ::proxsuite::linalg::veg::_detail::_meta::                 \
-             enable_if<__VEG_PP_UNWRAP Param, int>::type = 0>                  \
+             enable_if<__VEG_PP_ID(__VEG_PP_UNWRAP Param), int>::type = 0>     \
   auto __VEG_PP_CAT(check_, __VEG_PP_HEAD Name_Tpl)() noexcept                 \
     ->::proxsuite::linalg::veg::meta::true_type;
 
diff --git a/include/proxsuite/linalg/veg/internal/preprocessor.hpp b/include/proxsuite/linalg/veg/internal/preprocessor.hpp
@@ -120,8 +120,9 @@
 #define __VEG_PP_IS_1(X) __VEG_IMPL_PP_IS_1_I(X)
 #define __VEG_PP_IS_0(X) __VEG_PP_IS_1(__VEG_IMPL_PP_INC_I(X))
 
+#define __VEG_PP_ID(X) X
 
-#define __VEG_IMPL_PP_VARIADIC_SIZE(...) __VEG_IMPL_PP_COUNT(__VA_ARGS__, 32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0)
+#define __VEG_IMPL_PP_VARIADIC_SIZE(...) __VEG_PP_ID(__VEG_IMPL_PP_COUNT(__VA_ARGS__, 32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0))
 
 #define __VEG_IMPL_PP_MAKE_TUPLE0 ()
 #define __VEG_IMPL_PP_MAKE_TUPLE1 (0)
@@ -402,7 +403,8 @@
                 __VEG_IMPL_PP_IS_1(__VEG_PP_TUPLE_SIZE(Tuple)))                \
   (Macro, Data, Tuple)
 
-#define __VEG_PP_TUPLE_SIZE(Tuple) __VEG_IMPL_PP_VARIADIC_SIZE Tuple
+#define __VEG_PP_TUPLE_SIZE(Tuple)                                             \
+  __VEG_PP_ID(__VEG_IMPL_PP_VARIADIC_SIZE Tuple)
 #define __VEG_PP_SEQ_HEAD(Seq)                                                 \
         __VEG_IMPL_PP_SEQ_HEAD_0 Seq)
 #define __VEG_PP_SEQ_TAIL(Seq) __VEG_IMPL_PP_CONSUME Seq
@@ -421,9 +423,12 @@
 #define __VEG_PP_CAT2(A, ...) __VEG_IMPL_PP_CAT2(A, __VA_ARGS__)
 #define __VEG_PP_CAT3(A, ...) __VEG_IMPL_PP_CAT3(A, __VA_ARGS__)
 #define __VEG_PP_REMOVE_PAREN(...)                                             \
-  __VEG_IMPL_PP_REMOVE_PAREN2(__VEG_IMPL_PP_REMOVE_PAREN1 __VA_ARGS__)
+  __VEG_IMPL_PP_REMOVE_PAREN2(                                                 \
+    __VEG_PP_ID(__VEG_IMPL_PP_REMOVE_PAREN1 __VA_ARGS__))
 #define __VEG_PP_REMOVE_PAREN1(...)                                            \
-  __VEG_IMPL_PP_REMOVE_PAREN21(__VEG_IMPL_PP_REMOVE_PAREN11 __VA_ARGS__)
-#define __VEG_PP_UNWRAP(...) __VEG_PP_HEAD __VA_ARGS__ __VEG_PP_TAIL __VA_ARGS__
+  __VEG_IMPL_PP_REMOVE_PAREN21(                                                \
+    __VEG_PP_ID(__VEG_IMPL_PP_REMOVE_PAREN11 __VA_ARGS__))
+#define __VEG_PP_UNWRAP(...)                                                   \
+  __VEG_PP_ID(__VEG_PP_HEAD __VA_ARGS__ __VEG_PP_TAIL __VA_ARGS__)
 
 #endif /* end of include guard VEG_PREPROCESSOR_HPP_U2V3WRWYS */
diff --git a/include/proxsuite/linalg/veg/memory/dynamic_stack.hpp b/include/proxsuite/linalg/veg/memory/dynamic_stack.hpp
@@ -25,7 +25,7 @@ max2(isize a, isize b) noexcept -> isize
 constexpr auto
 round_up_pow2(isize a, isize b) noexcept -> isize
 {
-  return isize((usize(a) + ~-usize(b)) & -usize(b));
+  return isize((usize(a) + ~(0 - usize(b))) & (0 - usize(b)));
 }
 } // namespace _dynstack
 } // namespace _detail
diff --git a/include/proxsuite/linalg/veg/slice.hpp b/include/proxsuite/linalg/veg/slice.hpp
@@ -187,7 +187,7 @@ template<typename T, isize N>
 struct Array
 {
   static_assert(N > 0, ".");
-  T _[usize{ N }];
+  T _[static_cast<usize>(N)];
 
   constexpr auto as_ref() const -> Slice<T>
   {
diff --git a/include/proxsuite/linalg/veg/tuple.hpp b/include/proxsuite/linalg/veg/tuple.hpp
@@ -394,34 +394,38 @@ struct IndexedTuple<meta::index_sequence<Is...>, Ts...>
   void operator[](Fix<I> /*arg*/) const&& = delete;
 
   VEG_TEMPLATE((isize I),
-               requires(usize{ I } < sizeof...(Ts)),
+               requires(static_cast<usize>(I) < sizeof...(Ts)),
                VEG_NODISCARD VEG_INLINE VEG_CPP14(constexpr) auto
                operator[],
                (/*arg*/, Fix<I>)) &&
-    VEG_NOEXCEPT_IF(VEG_CONCEPT(nothrow_movable<ith<usize{ I }, Ts...>>))
-      -> ith<usize{ I }, Ts...>
+    VEG_NOEXCEPT_IF(
+      VEG_CONCEPT(nothrow_movable<ith<static_cast<usize>(I), Ts...>>))
+      -> ith<static_cast<usize>(I), Ts...>
   {
-    return __VEG_IMPL_LEAF_ONCE(*this, usize{ I }, ith<usize{ I }, Ts...>);
+    return __VEG_IMPL_LEAF_ONCE(
+      *this, static_cast<usize>(I), ith<static_cast<usize>(I), Ts...>);
   }
 
   VEG_TEMPLATE((isize I),
-               requires(usize{ I } < sizeof...(Ts)),
+               requires(static_cast<usize>(I) < sizeof...(Ts)),
                VEG_NODISCARD VEG_INLINE VEG_CPP14(constexpr) auto
                operator[],
                (/*arg*/, Fix<I>)) &
-    VEG_NOEXCEPT->ith<usize{ I }, Ts...>&
+    VEG_NOEXCEPT->ith<static_cast<usize>(I), Ts...>&
   {
-    return __VEG_IMPL_LEAF_MUT(*this, usize{ I }, ith<usize{ I }, Ts...>);
+    return __VEG_IMPL_LEAF_MUT(
+      *this, static_cast<usize>(I), ith<static_cast<usize>(I), Ts...>);
   }
 
   VEG_TEMPLATE((isize I),
-               requires(usize{ I } < sizeof...(Ts)),
+               requires(static_cast<usize>(I) < sizeof...(Ts)),
                VEG_NODISCARD VEG_INLINE VEG_CPP14(constexpr) auto
                operator[],
                (/*arg*/, Fix<I>))
-  const & VEG_NOEXCEPT->ith<usize{ I }, Ts...> const&
+  const & VEG_NOEXCEPT->ith<static_cast<usize>(I), Ts...> const&
   {
-    return __VEG_IMPL_LEAF(*this, usize{ I }, ith<usize{ I }, Ts...>);
+    return __VEG_IMPL_LEAF(
+      *this, static_cast<usize>(I), ith<static_cast<usize>(I), Ts...>);
   }
 };
 } // namespace tuple

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ max2(isize a, isize b) noexcept -> isize`
`25`	`25`	`constexpr auto`
`26`	`26`	`round_up_pow2(isize a, isize b) noexcept -> isize`
`27`	`27`	`{`
`28`		`- return isize((usize(a) + ~-usize(b)) & -usize(b));`
	`28`	`+ return isize((usize(a) + ~(0 - usize(b))) & (0 - usize(b)));`
`29`	`29`	`}`
`30`	`30`	`} // namespace _dynstack`
`31`	`31`	`} // namespace _detail`
Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ template<typename T, isize N>`
`187`	`187`	`struct Array`
`188`	`188`	`{`
`189`	`189`	`static_assert(N > 0, ".");`
`190`		`- T _[usize{ N }];`
	`190`	`+ T _[static_cast<usize>(N)];`
`191`	`191`
`192`	`192`	`constexpr auto as_ref() const -> Slice<T>`
`193`	`193`	`{`