Clear warnings under Visual Studio 2012

1 files changed, 13 insertions, 13 deletions

diff --git a/stdcpp.h b/stdcpp.h
index ee242ada..cdab9316 100644
--- a/stdcpp.h
+++ b/stdcpp.h
@@ -20,15 +20,15 @@
 #include <map>

 #include <new>

 

+// http://connect.microsoft.com/VisualStudio/feedback/details/1600701/type-info-does-not-compile-with-has-exceptions-0

 #if defined(_MSC_VER) && (_MSC_VER < 1900) && defined(_HAS_EXCEPTIONS) && (_HAS_EXCEPTIONS == 0)

-// Workaround for: https://connect.microsoft.com/VisualStudio/feedback/details/1600701/type-info-does-not-compile-with-has-exceptions-0

 namespace std {

   using ::type_info;

 }

 #endif

 

+// make_unchecked_array_iterator

 #if _MSC_VER >= 1600

-// for make_unchecked_array_iterator

 #include <iterator>

 #endif

 

@@ -46,31 +46,31 @@ namespace std {
 #include <climits>

 

 // uintptr_t and ptrdiff_t

-#if (__cplusplus < 201103L) && (!defined(_MSC_VER) || (_MSC_VER >= 1600))

+#if (__cplusplus < 201103L) && (!defined(_MSC_VER) || (_MSC_VER >= 1700))

 # include <stdint.h>

-#elif defined(_MSC_VER) && (_MSC_VER < 1600)

+#elif defined(_MSC_VER) && (_MSC_VER < 1700)

 # include <stddef.h>

 #endif

 

-#ifdef CRYPTOPP_INCLUDE_VECTOR_CC

 // workaround needed on Sun Studio 12u1 Sun C++ 5.10 SunOS_i386 128229-02 2009/09/21

-#include <vector.cc>

+#ifdef CRYPTOPP_INCLUDE_VECTOR_CC

+# include <vector.cc>

 #endif

 

 // for alloca

 #if defined(CRYPTOPP_BSD_AVAILABLE)

-#include <stdlib.h>

+# include <stdlib.h>

 #elif defined(CRYPTOPP_UNIX_AVAILABLE) || defined(__sun) || defined(QNX)

-#include <alloca.h>

+# include <alloca.h>

 #elif defined(CRYPTOPP_WIN32_AVAILABLE) || defined(__MINGW32__) || defined(__BORLANDC__)

-#include <malloc.h>

+# include <malloc.h>

 #endif

 

 #ifdef _MSC_VER

-#pragma warning(disable: 4231)	// re-disable this

-#ifdef _CRTAPI1

-#define CRYPTOPP_MSVCRT6

-#endif

+# pragma warning(disable: 4231)	// re-disable this

+# ifdef _CRTAPI1

+#  define CRYPTOPP_MSVCRT6

+# endif

 #endif

 

 #endif