From 837d1d4b3a6056430dabc8b438efaa9a1e06cdec Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Wed, 16 Jan 2019 17:48:20 +0000
Subject: [PATCH] EgtGeomKernel 2.1a1 : - ricompilata con VS 2017 (x32 come
 VS2013_XP, x64 come VS2017).

---
 CAvToolSurfTm.cpp     |   2 +-
 EgtGeomKernel.rc      | Bin 11718 -> 11710 bytes
 EgtGeomKernel.vcxproj |   9 +++++----
 stdafx.h              |   6 +++---
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/CAvToolSurfTm.cpp b/CAvToolSurfTm.cpp
index dda7cce..f04021e 100644
--- a/CAvToolSurfTm.cpp
+++ b/CAvToolSurfTm.cpp
@@ -141,7 +141,7 @@ CAvToolSurfTm::TestPath( PNTULIST& lPntM, const Vector3d& vtDir, const Vector3d&
       m_bBreak = false ;
       future<bool> vRes[MAX_PARTS] ;
       for ( int i = 0 ; i < nPartCnt ; ++ i)
-         vRes[i] = async( launch::any, &CAvToolSurfTm::TestSubPath, this, i, ref( vlPntM[i]), vtDir, dLinTol) ;
+         vRes[i] = async( launch::async, &CAvToolSurfTm::TestSubPath, this, i, ref( vlPntM[i]), vtDir, dLinTol) ;
      // attendo i risultati
       int nFin = 0 ;
       int nNextPE = 0 ;
diff --git a/EgtGeomKernel.rc b/EgtGeomKernel.rc
index 51c385cdf831e82802d91e1b929ecdf13a9118b8..deaa20a2596aa1cab39954d709b8e95c276bb118 100644
GIT binary patch
delta 314
zcmX>Wy)SyhJ2qY;1|0@N7@mBePn8ucvYC^ADbwUSA)U!TIORBv81#UO5*Z99D+=pQ
z_Tk#VXu0_>S3V<9El^@}Ax}IL9)q}<u^BM=FW1z`6NGQU&4^^&d_t6skvxO?q!9)M
oGERQL$}#zbXx3x{xjA^u!|y|&1E)_eQoaFqAS2`E0M#-M09%JknE(I)

delta 338
zcmdlNeJpyzJ2rkp1|0@VAU0$$0+J?^f3vBwg2gs7iZ5lFT*sv|IYE+R@;^>7PD2Jg
zpwb+mB1LZ9$zEI=7%evc=E`RTss~C;zQ`fIxlYE4aq|IQK1RIeax-HyYw~Zdsgrwz
sZ=o4C`2a7+<|CqPWE<HbjcTL^6JEy=_B7C;(<f&s-#~I`oJs;G0G;1bGXMYp

diff --git a/EgtGeomKernel.vcxproj b/EgtGeomKernel.vcxproj
index c207774..e107db9 100644
--- a/EgtGeomKernel.vcxproj
+++ b/EgtGeomKernel.vcxproj
@@ -22,6 +22,7 @@
     <ProjectGuid>{9A98A202-2853-454A-84CA-DCD1714176C9}</ProjectGuid>
     <RootNamespace>EgtGeomKernel</RootNamespace>
     <Keyword>MFCDLLProj</Keyword>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -36,7 +37,7 @@
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v120_xp</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -52,7 +53,7 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v120_xp</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -83,7 +84,7 @@
     <TargetName>$(ProjectName)D$(PlatformArchitecture)</TargetName>
     <OutDir>$(SolutionDir)$(Configuration)$(PlatformArchitecture)\</OutDir>
     <IntDir>$(Configuration)$(PlatformArchitecture)\</IntDir>
-    <IncludePath>C:\;$(IncludePath)</IncludePath>
+    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);C:\;</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
@@ -98,7 +99,7 @@
     <TargetName>$(ProjectName)R$(PlatformArchitecture)</TargetName>
     <OutDir>$(SolutionDir)$(Configuration)$(PlatformArchitecture)\</OutDir>
     <IntDir>$(Configuration)$(PlatformArchitecture)\</IntDir>
-    <IncludePath>C:\;$(IncludePath)</IncludePath>
+    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);C:\;</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
diff --git a/stdafx.h b/stdafx.h
index 829862a..f65e4f3 100644
--- a/stdafx.h
+++ b/stdafx.h
@@ -7,10 +7,10 @@
 
 #include "/EgtDev/Include/EgtTargetVer.h"
 
-#include <stdio.h>
+#include <cstdio>
 #include <tchar.h>
-#include <float.h>
-#include <math.h>
+#include <cfloat>
+#include <cmath>
 
 // in Debug riconoscimento memory leakage
 #if defined( _DEBUG)