Changed: Reactivate runtime checks and optimizations

This commit is contained in:
kervala 2010-10-18 09:15:14 +02:00
parent 1c88a7a0fb
commit bd5806ab62
2 changed files with 2 additions and 17 deletions

View file

@ -85,13 +85,6 @@ typedef struct SHA1Context
int Corrupted; /* Is the message digest corrupted? */ int Corrupted; /* Is the message digest corrupted? */
} SHA1Context; } SHA1Context;
// Because the code does some tricky stuff, VC>6 would cry at runtime
#ifdef _MFC_VER
#pragma runtime_checks( "", off )
#endif
// //
// Function Prototypes // Function Prototypes
// //
@ -194,10 +187,6 @@ CHashKey getSHA1(const string &filename, bool forcePath)
return hk; return hk;
} }
#ifdef _MFC_VER
#pragma runtime_checks( "", off )
#endif
/* /*
* Define the SHA1 circular left shift macro * Define the SHA1 circular left shift macro
*/ */
@ -554,7 +543,3 @@ void SHA1PadMessage(SHA1Context *context)
SHA1ProcessMessageBlock(context); SHA1ProcessMessageBlock(context);
} }
#ifdef _MFC_VER
#pragma runtime_checks( "", restore )
#endif

View file

@ -1638,7 +1638,7 @@ float NLPACS::CLocalRetriever::getInteriorHeightAround(const ULocalPosition &pos
// *************************************************************************** // ***************************************************************************
#ifdef NL_OS_WINDOWS #ifdef NL_OS_WINDOWS
#pragma optimize( "", off ) //#pragma optimize( "", off )
#endif // NL_OS_WINDOWS #endif // NL_OS_WINDOWS
void NLPACS::CLocalRetriever::findPath(const NLPACS::CLocalRetriever::CLocalPosition &A, void NLPACS::CLocalRetriever::findPath(const NLPACS::CLocalRetriever::CLocalPosition &A,
@ -1853,7 +1853,7 @@ void NLPACS::CLocalRetriever::findPath(const NLPACS::CLocalRetriever::CLocalPosi
path.push_back(CVector2s(B.Estimation)); path.push_back(CVector2s(B.Estimation));
} }
#ifdef NL_OS_WINDOWS #ifdef NL_OS_WINDOWS
#pragma optimize( "", on ) //#pragma optimize( "", on )
#endif // NL_OS_WINDOWS #endif // NL_OS_WINDOWS
// *************************************************************************** // ***************************************************************************