diff --git a/EGkCurveLocal.h b/EGkCurveLocal.h index 0ca0c54..18e71a6 100644 --- a/EGkCurveLocal.h +++ b/EGkCurveLocal.h @@ -57,7 +57,7 @@ class CurveLocal return ; m_pCrv = m_pCopy ; } - CurveLocal( CurveLocal&& Other) _NOEXCEPT + CurveLocal( CurveLocal&& Other) : m_pCrv( Other.m_pCrv), m_pCopy( Other.m_pCopy) { // annullo gli originali Other.m_pCrv = nullptr ; diff --git a/EGkSurfLocal.h b/EGkSurfLocal.h index d66d221..3830876 100644 --- a/EGkSurfLocal.h +++ b/EGkSurfLocal.h @@ -57,7 +57,7 @@ class SurfLocal return ; m_pSrf = m_pCopy ; } - SurfLocal( SurfLocal&& Other) _NOEXCEPT + SurfLocal( SurfLocal&& Other) : m_pSrf( Other.m_pSrf), m_pCopy( Other.m_pCopy) { // annullo gli originali Other.m_pSrf = nullptr ; diff --git a/EGkVector3d.h b/EGkVector3d.h index 1ef6268..776c555 100644 --- a/EGkVector3d.h +++ b/EGkVector3d.h @@ -14,7 +14,7 @@ #pragma once #include "/EgtDev/Include/EGkGeoConst.h" -#include +#include //----------------------- Macro per import/export ----------------------------- #undef EGK_EXPORT diff --git a/EgtTargetVer.h b/EgtTargetVer.h index b8bf053..aba8dd4 100644 --- a/EgtTargetVer.h +++ b/EgtTargetVer.h @@ -1,20 +1,25 @@ //---------------------------------------------------------------------------- -// EgalTech 2013-2013 +// EgalTech 2013-2019 //---------------------------------------------------------------------------- -// File : EgtTargetVer.h Data : 20.11.13 Versione : 1.3a1 +// File : EgtTargetVer.h Data : 16.01.19 Versione : 2.1a1 // Contenuto : Dichiarazione macro per versione Windows target. // // // // Modifiche : 20.11.13 DS Creazione modulo. -// +// 16.01.19 DS Modifiche per Win32 con WindowsXp e Win64 con Windows7. // //---------------------------------------------------------------------------- #pragma once - -#define WINVER 0x0502 // WindowsXP SP2 -#define _WIN32_WINNT 0x0502 // WindowsXP SP2 -#define _WIN32_IE 0x0603 // IE6 SP2 +#if defined( _WIN64) + #define WINVER 0x0601 // Windows7 + #define _WIN32_WINNT 0x0601 // Windows7 + #define _WIN32_IE 0x0800 // IE8 +#else + #define WINVER 0x0502 // WindowsXP SP2 + #define _WIN32_WINNT 0x0502 // WindowsXP SP2 + #define _WIN32_IE 0x0603 // IE6 SP2 +#endif