From 87565b46b9539ab5acad042885e1df1074fef248 Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 18 Oct 2010 09:15:14 +0200 Subject: [PATCH] Changed: Reactivate runtime checks and optimizations --- code/nel/src/misc/sha1.cpp | 15 --------------- code/nel/src/pacs/local_retriever.cpp | 4 ++-- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/code/nel/src/misc/sha1.cpp b/code/nel/src/misc/sha1.cpp index eb25b3a84..bb375a928 100644 --- a/code/nel/src/misc/sha1.cpp +++ b/code/nel/src/misc/sha1.cpp @@ -85,13 +85,6 @@ typedef struct SHA1Context int Corrupted; /* Is the message digest corrupted? */ } SHA1Context; - -// Because the code does some tricky stuff, VC>6 would cry at runtime -#ifdef _MFC_VER - #pragma runtime_checks( "", off ) -#endif - - // // Function Prototypes // @@ -194,10 +187,6 @@ CHashKey getSHA1(const string &filename, bool forcePath) return hk; } -#ifdef _MFC_VER - #pragma runtime_checks( "", off ) -#endif - /* * Define the SHA1 circular left shift macro */ @@ -554,7 +543,3 @@ void SHA1PadMessage(SHA1Context *context) SHA1ProcessMessageBlock(context); } - -#ifdef _MFC_VER - #pragma runtime_checks( "", restore ) -#endif diff --git a/code/nel/src/pacs/local_retriever.cpp b/code/nel/src/pacs/local_retriever.cpp index 0aabd5532..4f4c85907 100644 --- a/code/nel/src/pacs/local_retriever.cpp +++ b/code/nel/src/pacs/local_retriever.cpp @@ -1638,7 +1638,7 @@ float NLPACS::CLocalRetriever::getInteriorHeightAround(const ULocalPosition &pos // *************************************************************************** #ifdef NL_OS_WINDOWS -#pragma optimize( "", off ) +//#pragma optimize( "", off ) #endif // NL_OS_WINDOWS 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)); } #ifdef NL_OS_WINDOWS -#pragma optimize( "", on ) +//#pragma optimize( "", on ) #endif // NL_OS_WINDOWS // ***************************************************************************