Merge pull request #421 from ckormanyos/restore_vs2022_toolset

Fix #422 via restore vs2022 toolset in CI
ckormanyos · Aug 26, 2024 · 095856c · 095856c
2 parents 32401ff + 8b71709
commit 095856c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 33 deletions.
diff --git a/.github/workflows/wide_integer.yml b/.github/workflows/wide_integer.yml
@@ -480,22 +480,22 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: '0'
-      - uses: ilammy/msvc-dev-cmd@v1
-        with:
-          toolset: 14.2
       - name: clone-submods-bootstrap-headers-boost-develop
         run: |
           git clone -b develop --depth 1 https://github.com/boostorg/boost.git ../boost-root
           cd ../boost-root
           git submodule update --init tools
           git submodule update --init libs/config
           git submodule update --init libs/multiprecision
-          ./bootstrap.bat
-          ./b2 headers
       - uses: actions/checkout@v4
       - uses: ilammy/msvc-dev-cmd@v1
         with:
           toolset: 14.2
+      - name: bootstrap-boost
+        working-directory: ${{ runner.workspace }}/boost-root
+        run: |
+          ./bootstrap.bat
+          ./b2 headers
       - name: msvc-release-x64
         shell: cmd
         working-directory: ./
@@ -520,7 +520,7 @@ jobs:
           git submodule update --init libs/multiprecision
       - uses: ilammy/msvc-dev-cmd@v1
         with:
-          toolset: 14.2
+          toolset: 14.4
       - name: bootstrap-boost
         working-directory: ${{ runner.workspace }}/boost-root
         run: |

diff --git a/boost/multiprecision/uintwide_t_backend.hpp b/boost/multiprecision/uintwide_t_backend.hpp
@@ -532,9 +532,7 @@
                            const uintwide_t_backend<MyWidth2, MyLimbType, MyAllocatorType>& p,
                            const uintwide_t_backend<MyWidth2, MyLimbType, MyAllocatorType>& m) -> void
   {
-    result.representation() = powm(b.crepresentation(),
-                                   p.crepresentation(),
-                                   m.crepresentation());
+    result.representation() = powm(b.crepresentation(), p.crepresentation(), m.crepresentation());
   }
 
   template<
@@ -555,26 +553,6 @@
     result.representation() = powm(b.crepresentation(), p.crepresentation(), m);
   }
 
-  template<
-  #if defined(WIDE_INTEGER_NAMESPACE)
-           const WIDE_INTEGER_NAMESPACE::math::wide_integer::size_t MyWidth2,
-  #else
-           const ::math::wide_integer::size_t MyWidth2,
-  #endif
-           typename MyLimbType,
-           typename MyAllocatorType,
-           typename OtherIntegralTypeP,
-           std::enable_if_t<(std::is_integral<OtherIntegralTypeP>::value)> const* = nullptr>
-  constexpr auto eval_powm(      uintwide_t_backend<MyWidth2, MyLimbType, MyAllocatorType>& result,
-                           const uintwide_t_backend<MyWidth2, MyLimbType, MyAllocatorType>& b,
-                           const OtherIntegralTypeP                                         p,
-                           const uintwide_t_backend<MyWidth2, MyLimbType, MyAllocatorType>& m) -> void
-  {
-    result.representation() = powm(b.crepresentation(),
-                                   p,
-                                   m.crepresentation());
-  }
-
   template<
   #if defined(WIDE_INTEGER_NAMESPACE)
            const WIDE_INTEGER_NAMESPACE::math::wide_integer::size_t MyWidth2,

diff --git a/wide_integer_vs2022.vcxproj b/wide_integer_vs2022.vcxproj
@@ -30,26 +30,26 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>