From eeab41af4e3dc583809d98cf22d72f86507e8204 Mon Sep 17 00:00:00 2001
From: DarioS <dario.sassi@egaltech.com>
Date: Tue, 20 Jul 2021 18:13:21 +0200
Subject: [PATCH] =?UTF-8?q?EgtNumKernel=202.3g1=20:=20-=20versione=20x64?=
 =?UTF-8?q?=20compilata=20con=20Clang-cl/LLVM=20-=20modifiche=20varie=20pe?=
 =?UTF-8?q?r=20eliminare=20warning=20pi=C3=B9=20gravi=20di=20questo=20comp?=
 =?UTF-8?q?ilatore.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 EgtNumKernel.rc      | Bin 11662 -> 11662 bytes
 EgtNumKernel.vcxproj |   6 ++++--
 JenkinsTraub.cpp     |   3 ++-
 JenkinsTraub.h       |   6 +++---
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/EgtNumKernel.rc b/EgtNumKernel.rc
index 5082d3e42ed755ada7f0e7a875da752ced797f8d..fd0f54d27a2140b89e0c9d16e7f1effc31141695 100644
GIT binary patch
delta 102
zcmeB+?u*{=jg8TK^J+PHX6AGT!^sDgbvOS~bYa}w#qGchlsL_2jV$5BxVb{u3A;pw
LG*|-7s43h4+B6|n

delta 102
zcmeB+?u*{=jg8S{^J+PHX66(I!^sDgbvOS~bYa}w#qGchlsL_2jV$5BxVb{u3A;pw
LG*|-7s43h4)jT0S

diff --git a/EgtNumKernel.vcxproj b/EgtNumKernel.vcxproj
index 37d95f4..0505520 100644
--- a/EgtNumKernel.vcxproj
+++ b/EgtNumKernel.vcxproj
@@ -35,7 +35,7 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>ClangCL</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -49,7 +49,7 @@
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>ClangCL</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -124,6 +124,7 @@ copy $(TargetPath) \EgtProg\DllD32</Command>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;I_AM_ENK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <OpenMPSupport>true</OpenMPSupport>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -184,6 +185,7 @@ copy $(TargetPath) \EgtProg\Dll32</Command>
       <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
       <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
diff --git a/JenkinsTraub.cpp b/JenkinsTraub.cpp
index 1011c16..5e66e38 100644
--- a/JenkinsTraub.cpp
+++ b/JenkinsTraub.cpp
@@ -1007,7 +1007,7 @@ Cpoly::fxshft( const int l2, double* zr, double* zi, bool* pbConv)
 
       // Test for convergence unless stage 3 has failed once or this
       // is the last H Polynomial
-      if ( ! ( bBol  ||  ! bTest  ||  j == 12))
+      if ( ! ( bBol  ||  ! bTest  ||  j == 12)) {
          if ( cmod( tr - otr, ti - oti) < 0.5 * cmod( *zr, *zi)) {
             if ( bPasd) {
                // The weak convergence test has been passwed twice, start the third stage
@@ -1038,6 +1038,7 @@ Cpoly::fxshft( const int l2, double* zr, double* zi, bool* pbConv)
          }
          else
             bPasd = false ;
+      }
    }
 
    // Attempt an iteration with final H polynomial from second stage
diff --git a/JenkinsTraub.h b/JenkinsTraub.h
index 49b84a7..bc583b3 100644
--- a/JenkinsTraub.h
+++ b/JenkinsTraub.h
@@ -39,9 +39,9 @@ class Rpoly {
       int itercnt ;
 
    private :         // members
-      int    n, nn, nmi ;
-      double sr, si, u, v, a, b, c, d, a1, a2 ;
-      double a3, a6, a7, e, f, g, h, szr, szi, lzr, lzi ;
+      int    n ;
+      double sr, si, u, v, a, b, c, d, a1, a3, a7 ;
+      double e, f, g, h, szr, szi, lzr, lzi ;
       double eta, are, mre ;
       double p[POLY_MAXDEG+1] ;
       double qp[POLY_MAXDEG+1] ;