MSVC compatibility fixes

Author: void2012

nh3api/core/nh3api_std/algorithm.hpp

@@ -950,18 +950,9 @@ NoThrowForwardIt uninitialized_move(InputIt first,
 }
 // #endif
 
-template<class T, class Size> NH3API_CONSTEXPR_CPP_20
-void init_array(T* first, Size n)
-{
-    #if NH3API_DEBUG
-    verify_range_n(first, n);
-    #endif
-    init_array_impl(first, n, tt::is_nothrow_default_constructible<T>());
-}
-
 template<class T, class Size>
 NH3API_FORCEINLINE NH3API_CONSTEXPR_CPP_20
-void init_array_impl(T* first, Size n, tt::false_type)
+T* init_array_impl(T* first, Size n, tt::false_type)
 {
     T* current = first;
     NH3API_TRY
@@ -975,16 +966,27 @@ void init_array_impl(T* first, Size n, tt::false_type)
         destroy(first, current);
         NH3API_RETHROW
     }
+    return current;
 }
 
 template<class T, class Size>
 NH3API_FORCEINLINE NH3API_CONSTEXPR_CPP_20
-void init_array_impl(T* first, Size n, tt::true_type)
+T* init_array_impl(T* first, Size n, tt::true_type)
 {
     T* current = first;
     for (; n > 0; (void) ++current, --n)
         ::new (const_cast<void*>(static_cast<const volatile void*>(
-            addressof(*current)))) T;
+            nh3api::addressof(*current)))) T;
+    return current;
+}
+
+template<class T, class Size> NH3API_CONSTEXPR_CPP_20
+T* init_array(T* first, Size n)
+{
+    #if NH3API_DEBUG
+    verify_range_n(first, n);
+    #endif
+    return init_array_impl(first, n, tt::is_nothrow_default_constructible<T>());
 }
 
 template <typename InputIterator, typename OutputIterator>

nh3api/core/nh3api_std/exe_vector.hpp

@@ -214,9 +214,9 @@ struct exe_vector_helper
         }
 
         NH3API_CONSTEXPR_CPP_20
-        void default_fill(pointer first, size_type count)
+        pointer default_fill(pointer first, size_type count)
         {
-            nh3api::uninitialized_default_construct_n(first, count, alloc);
+            return nh3api::uninitialized_default_construct_n(first, count, alloc);
         }
 
     public:
@@ -385,10 +385,10 @@ struct exe_vector_helper<exe_allocator<T> >
         }
 
         NH3API_FORCEINLINE
-        void default_fill(pointer first, size_type count)
+        pointer default_fill(pointer first, size_type count)
         NH3API_NOEXCEPT_EXPR(nh3api::tt::is_nothrow_default_constructible<value_type>::value)
         {
-            nh3api::init_array(first, count);
+            return nh3api::init_array(first, count);
         }
 
     public:

nh3api/core/nh3api_std/nh3api_std.hpp

@@ -339,25 +339,29 @@
     #endif
 
     #ifndef NH3API_CONSTEXPR_CPP_20
-        #ifdef _CONSTEXPR20
-            #define NH3API_CONSTEXPR_CPP_20 _CONSTEXPR20
+        #ifdef _CONSTEXPR20 // avoid stupid MSVC double inline warning
+            #define NH3API_CONSTEXPR_CPP_20 constexpr
         #else
             #define NH3API_CONSTEXPR_CPP_20
         #endif
     #endif
 
     #ifndef NH3API_CONSTEXPR_CPP_17
-        #ifdef _CONSTEXPR17
-            #define NH3API_CONSTEXPR_CPP_17 _CONSTEXPR17
+        #ifdef _CONSTEXPR17 // avoid stupid MSVC double inline warning
+            #define NH3API_CONSTEXPR_CPP_17 constexpr
         #else
             #define NH3API_CONSTEXPR_CPP_17
         #endif
     #endif
 
     #ifndef NH3API_CONSTEXPR_CPP_14
-        #ifdef _CONSTEXPR17
-            #define NH3API_CONSTEXPR_CPP_14 constexpr
-        #else
+        #ifdef __cpp_constexpr
+            #if __cpp_constexpr >= 201304L
+                #define NH3API_CONSTEXPR_CPP_14 constexpr
+            #else 
+                #define NH3API_CONSTEXPR_CPP_14
+            #endif
+        #else 
             #define NH3API_CONSTEXPR_CPP_14
         #endif
     #endif

nh3api/hd_mod.hpp

@@ -97,8 +97,9 @@ bool isHDPlusPresent(Patcher* patcher)
 NH3API_FORCEINLINE
 POINT getHDModResolution(Patcher* patcher)
 {
-    POINT result = { .x = getHDModVariable<int32_t, 0>(patcher, "HD.Option.RezX"),
-                     .y = getHDModVariable<int32_t, 0>(patcher, "HD.Option.RezY") };
+    POINT result;
+    result.x = getHDModVariable<int32_t, 0>(patcher, "HD.Option.RezX");
+    result.y = getHDModVariable<int32_t, 0>(patcher, "HD.Option.RezY");
     return result;
 }
 
@@ -129,7 +130,9 @@ POINT getScreenResolution(Patcher* patcher)
     }
     else
     {
-        POINT result = { .x = 800, .y = 600 };
+        POINT result;
+        result.x = 800;
+        result.y = 600;
         return result;
     }
 }
@@ -169,7 +172,7 @@ struct is_wine_present_impl
         {
             library = GetModuleHandleA("ntdll.dll");
             if ( library ) // I *really* hope you're running it with windows or WINE
-                func = GetProcAddress(status.second, "wine_get_version");
+                func = GetProcAddress(library, "wine_get_version");
             initialized = true;
         }
         if ( library )