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

Fix compile error on Windows due to symbol U collision (GH #599) 

A package called cpprest provides U as a macro
pull/600/head
Jeffrey Walton 2018-03-16 09:00:50 -04:00
parent 92ad65bfae
commit 244abbe41c
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
secblock.h
View File

@ -71,22 +71,22 @@ public:
#if defined(CRYPTOPP_CXX11_VARIADIC_TEMPLATES) || defined(CRYPTOPP_DOXYGEN_PROCESSING) #if defined(CRYPTOPP_CXX11_VARIADIC_TEMPLATES) || defined(CRYPTOPP_DOXYGEN_PROCESSING)
/// \brief Constructs a new U using variadic arguments /// \brief Constructs a new V using variadic arguments
/// \tparam U the type to be forwarded /// \tparam V the type to be forwarded
/// \tparam Args the arguments to be forwarded /// \tparam Args the arguments to be forwarded
/// \param ptr pointer to type U /// \param ptr pointer to type V
/// \param args variadic arguments /// \param args variadic arguments
/// \details This is a C++11 feature. It is available when CRYPTOPP_CXX11_VARIADIC_TEMPLATES /// \details This is a C++11 feature. It is available when CRYPTOPP_CXX11_VARIADIC_TEMPLATES
/// is defined. The define is controlled by compiler versions detected in config.h. /// is defined. The define is controlled by compiler versions detected in config.h.
template<typename U, typename... Args> template<typename V, typename... Args>
void construct(U* ptr, Args&&... args) {::new ((void*)ptr) U(std::forward<Args>(args)...);} void construct(V* ptr, Args&&... args) {::new ((void*)ptr) V(std::forward<Args>(args)...);}
/// \brief Destroys an U constructed with variadic arguments /// \brief Destroys an V constructed with variadic arguments
/// \tparam U the type to be forwarded /// \tparam V the type to be forwarded
/// \details This is a C++11 feature. It is available when CRYPTOPP_CXX11_VARIADIC_TEMPLATES /// \details This is a C++11 feature. It is available when CRYPTOPP_CXX11_VARIADIC_TEMPLATES
/// is defined. The define is controlled by compiler versions detected in config.h. /// is defined. The define is controlled by compiler versions detected in config.h.
template<typename U> template<typename V>
void destroy(U* ptr) {if (ptr) ptr->~U();} void destroy(V* ptr) {if (ptr) ptr->~V();}
#endif #endif
@ -247,16 +247,16 @@ public:
} }
/// \brief Template class memeber Rebind /// \brief Template class memeber Rebind
/// \tparam U bound class or type /// \tparam V bound class or type
/// \details Rebind allows a container class to allocate a different type of object /// \details Rebind allows a container class to allocate a different type of object
/// to store elements. For example, a std::list will allocate std::list_node to /// to store elements. For example, a std::list will allocate std::list_node to
/// store elements in the list. /// store elements in the list.
/// \details VS.NET STL enforces the policy of "All STL-compliant allocators /// \details VS.NET STL enforces the policy of "All STL-compliant allocators
/// have to provide a template class member called rebind". /// have to provide a template class member called rebind".
template <class U> struct rebind { typedef AllocatorWithCleanup<U, T_Align16> other; }; template <class V> struct rebind { typedef AllocatorWithCleanup<V, T_Align16> other; };
#if _MSC_VER >= 1500 #if _MSC_VER >= 1500
AllocatorWithCleanup() {} AllocatorWithCleanup() {}
template <class U, bool A> AllocatorWithCleanup(const AllocatorWithCleanup<U, A> &) {} template <class V, bool A> AllocatorWithCleanup(const AllocatorWithCleanup<V, A> &) {}
#endif #endif
}; };
@ -866,10 +866,10 @@ public:
explicit SecBlockWithHint(size_t size) : SecBlock<T, A>(size) {} explicit SecBlockWithHint(size_t size) : SecBlock<T, A>(size) {}
}; };
template<class T, bool A, class U, bool B> template<class T, bool A, class V, bool B>
inline bool operator==(const CryptoPP::AllocatorWithCleanup<T, A>&, const CryptoPP::AllocatorWithCleanup<U, B>&) {return (true);} inline bool operator==(const CryptoPP::AllocatorWithCleanup<T, A>&, const CryptoPP::AllocatorWithCleanup<V, B>&) {return (true);}
template<class T, bool A, class U, bool B> template<class T, bool A, class V, bool B>
inline bool operator!=(const CryptoPP::AllocatorWithCleanup<T, A>&, const CryptoPP::AllocatorWithCleanup<U, B>&) {return (false);} inline bool operator!=(const CryptoPP::AllocatorWithCleanup<T, A>&, const CryptoPP::AllocatorWithCleanup<V, B>&) {return (false);}
NAMESPACE_END NAMESPACE_END