Revert "Add hack to pickup C++11 alignas"
This reverts commit 16df6e64a8. Detailed testing is revealing some fractures. The pain point seems to be C++11 is more strict about the location of the 'alignas(N)' in the statement-expression. Some compilers accept a looser grammar; while others do not.
Clang 3.3 is rejecting some of the statements with CRYPTOPP_ALIGN_DATA(N). Others may do the same, and we need to look at ICC in particular.
pull/186/head
parent
16df6e64a8
commit
0414faff8e
6
config.h
6
config.h
|
|
@ -829,12 +829,6 @@ NAMESPACE_END
|
||||||
# define CRYPTOPP_NO_THROW
|
# define CRYPTOPP_NO_THROW
|
||||||
#endif // CRYPTOPP_CXX11_NOEXCEPT
|
#endif // CRYPTOPP_CXX11_NOEXCEPT
|
||||||
|
|
||||||
// Hack... CRYPTOPP_ALIGN_DATA is defined earlier, before C++11 alignas availability is determined
|
|
||||||
#if defined(CRYPTOPP_CXX11_ALIGNAS)
|
|
||||||
# undef CRYPTOPP_ALIGN_DATA
|
|
||||||
# define CRYPTOPP_ALIGN_DATA(x) alignas(x)
|
|
||||||
#endif // CRYPTOPP_CXX11_ALIGNAS
|
|
||||||
|
|
||||||
// OK to comment the following out, but please report it so we can fix it.
|
// OK to comment the following out, but please report it so we can fix it.
|
||||||
#if (defined(__cplusplus) && (__cplusplus >= 199711L)) && !defined(CRYPTOPP_UNCAUGHT_EXCEPTION_AVAILABLE)
|
#if (defined(__cplusplus) && (__cplusplus >= 199711L)) && !defined(CRYPTOPP_UNCAUGHT_EXCEPTION_AVAILABLE)
|
||||||
# error "std::uncaught_exception is not available. This is likely a configuration error."
|
# error "std::uncaught_exception is not available. This is likely a configuration error."
|
||||||
|
|
|
||||||
|
|
@ -827,12 +827,6 @@ NAMESPACE_END
|
||||||
# define CRYPTOPP_NO_THROW
|
# define CRYPTOPP_NO_THROW
|
||||||
#endif // CRYPTOPP_CXX11_NOEXCEPT
|
#endif // CRYPTOPP_CXX11_NOEXCEPT
|
||||||
|
|
||||||
// Hack... CRYPTOPP_ALIGN_DATA is defined earlier, before C++11 alignas availability is determined
|
|
||||||
#if defined(CRYPTOPP_CXX11_ALIGNAS)
|
|
||||||
# undef CRYPTOPP_ALIGN_DATA
|
|
||||||
# define CRYPTOPP_ALIGN_DATA(x) alignas(x)
|
|
||||||
#endif // CRYPTOPP_CXX11_ALIGNAS
|
|
||||||
|
|
||||||
// OK to comment the following out, but please report it so we can fix it.
|
// OK to comment the following out, but please report it so we can fix it.
|
||||||
#if (defined(__cplusplus) && (__cplusplus >= 199711L)) && !defined(CRYPTOPP_UNCAUGHT_EXCEPTION_AVAILABLE)
|
#if (defined(__cplusplus) && (__cplusplus >= 199711L)) && !defined(CRYPTOPP_UNCAUGHT_EXCEPTION_AVAILABLE)
|
||||||
# error "std::uncaught_exception is not available. This is likely a configuration error."
|
# error "std::uncaught_exception is not available. This is likely a configuration error."
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue