From 83f5ea8a5c4c10cb6ae0a9889cd9f00c7528b6da Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Sun, 15 Feb 2015 17:36:29 +0000 Subject: [PATCH] Include : - aggiornamenti vari. --- EGkTriangle3d.h | 2 +- EGnStringConverter.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/EGkTriangle3d.h b/EGkTriangle3d.h index a146125..5ade4cd 100644 --- a/EGkTriangle3d.h +++ b/EGkTriangle3d.h @@ -70,7 +70,7 @@ class Triangle3d if ( dTwoArea < EPS_SMALL * EPS_SMALL) return INFINITO ; else - return ( std::max( dSqDistA, std::max( dSqDistB, dSqDistC)) / dTwoArea) ; + return ( (std::max)( dSqDistA, (std::max)( dSqDistB, dSqDistC)) / dTwoArea) ; } private : diff --git a/EGnStringConverter.h b/EGnStringConverter.h index e261d64..db08951 100644 --- a/EGnStringConverter.h +++ b/EGnStringConverter.h @@ -275,7 +275,7 @@ class wcharBuffer wchar_t* data( void) { return m_wBuffer.data() ; } void terminate( size_t nLen) - { nLen = std::min( nLen, m_wBuffer.size() - 1) ; + { nLen = (std::min)( nLen, m_wBuffer.size() - 1) ; m_wBuffer[nLen] = '\0' ; } private :