arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added guard and specialization for APple with and without "-std=c++11"

pull/35/head
Jeffrey Walton 2015-07-27 12:40:06 -04:00
parent e40ff65269
commit 5eff653a54
1 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
misc.h
View File

@ -1,10 +1,14 @@
#ifndef CRYPTOPP_MISC_H #ifndef CRYPTOPP_MISC_H
#define CRYPTOPP_MISC_H #define CRYPTOPP_MISC_H
#include <cstddef> // for size_t when -stdlib=libc++
#include "cryptlib.h" #include "cryptlib.h"
#include "smartptr.h" #include "smartptr.h"
#include "trap.h" #include "trap.h"
#include <string.h> // for memcpy and memmove
#include <cstring> // for memcpy and memmove
#include <cstddef> // for size_t when -stdlib=libc++
#include <iosfwd> // for std::streamsize #include <iosfwd> // for std::streamsize
#include <limits> // for std::numeric_limits #include <limits> // for std::numeric_limits
@ -370,8 +374,8 @@ inline bool SafeConvert(T1 from, T2 &to)
return true; return true;
} }
// MSVC see this as a duplicate specialization // MSVC see this as a duplicate specialization. Apple can't find std::streamsize.
#ifndef _MSC_VER #if !defined(_MSC_VER) && !defined(__APPLE__)
// files.cpp, line 235 // files.cpp, line 235
template<> template<>
inline bool SafeConvert<size_t,std::streamsize>(size_t from, std::streamsize &to) inline bool SafeConvert<size_t,std::streamsize>(size_t from, std::streamsize &to)
@ -383,6 +387,19 @@ inline bool SafeConvert<size_t,std::streamsize>(size_t from, std::streamsize &to
} }
#endif #endif
// Apple can't find std::streamsize
#if defined(__APPLE__)
// files.cpp, line 235
template<>
inline bool SafeConvert<unsigned long, long>(unsigned long from, long &to)
{
to = (long)from;
if(from > static_cast<unsigned long>(std::numeric_limits<long>::max()))
return false;
return true;
}
#endif
// files.cpp, line 366 // files.cpp, line 366
template<> template<>
inline bool SafeConvert<long long unsigned int,long int>(long long unsigned int from, long int &to) inline bool SafeConvert<long long unsigned int,long int>(long long unsigned int from, long int &to)
@ -681,6 +698,11 @@ template<> inline void SecureWipeBuffer(word64 *buf, size_t n)
#endif // #if (_MSC_VER >= 1400 || defined(__GNUC__)) && (CRYPTOPP_BOOL_X64 || CRYPTOPP_BOOL_X86) #endif // #if (_MSC_VER >= 1400 || defined(__GNUC__)) && (CRYPTOPP_BOOL_X64 || CRYPTOPP_BOOL_X86)
#if GCC_DIAGNOSTIC_AWARE
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wcast-align"
#endif
template <class T> template <class T>
inline void SecureWipeArray(T *buf, size_t n) inline void SecureWipeArray(T *buf, size_t n)
{ {
@ -694,6 +716,10 @@ inline void SecureWipeArray(T *buf, size_t n)
SecureWipeBuffer((byte *)buf, n * sizeof(T)); SecureWipeBuffer((byte *)buf, n * sizeof(T));
} }
#if GCC_DIAGNOSTIC_AWARE
# pragma GCC diagnostic pop
#endif
// this function uses wcstombs(), which assumes that setlocale() has been called // this function uses wcstombs(), which assumes that setlocale() has been called
static inline std::string StringNarrow(const wchar_t *str, bool throwOnError = true) static inline std::string StringNarrow(const wchar_t *str, bool throwOnError = true)
{ {