Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Attempt to repair VS2013 builds. #833

Merged
merged 1 commit into from Aug 10, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions Release/include/cpprest/asyncrt_utils.h
Expand Up @@ -356,7 +356,7 @@ namespace details
/// Our own implementation of alpha numeric instead of std::isalnum to avoid
/// taking global lock for performance reasons.
/// </summary>
inline bool __cdecl is_alnum(const unsigned char uch) noexcept
inline bool __cdecl is_alnum(const unsigned char uch) CPPREST_NOEXCEPT
{ // test if uch is an alnum character
// special casing char to avoid branches
static constexpr bool is_alnum_table[UCHAR_MAX + 1] =
Expand All @@ -379,7 +379,7 @@ namespace details
/// Our own implementation of alpha numeric instead of std::isalnum to avoid
/// taking global lock for performance reasons.
/// </summary>
inline bool __cdecl is_alnum(const char ch) noexcept
inline bool __cdecl is_alnum(const char ch) CPPREST_NOEXCEPT
{
return (is_alnum(static_cast<unsigned char>(ch)));
}
Expand All @@ -389,7 +389,7 @@ namespace details
/// taking global lock for performance reasons.
/// </summary>
template<class Elem>
inline bool __cdecl is_alnum(Elem ch) noexcept
inline bool __cdecl is_alnum(Elem ch) CPPREST_NOEXCEPT
{
// assumes 'x' == L'x' for the ASCII range
typedef typename std::make_unsigned<Elem>::type UElem;
Expand Down
26 changes: 13 additions & 13 deletions Release/include/cpprest/http_headers.h
Expand Up @@ -79,19 +79,19 @@ class http_headers
/// <summary>
/// STL-style typedefs
/// </summary>
typedef typename inner_container::key_type key_type;
typedef typename inner_container::key_compare key_compare;
typedef typename inner_container::allocator_type allocator_type;
typedef typename inner_container::size_type size_type;
typedef typename inner_container::difference_type difference_type;
typedef typename inner_container::pointer pointer;
typedef typename inner_container::const_pointer const_pointer;
typedef typename inner_container::reference reference;
typedef typename inner_container::const_reference const_reference;
typedef typename inner_container::iterator iterator;
typedef typename inner_container::const_iterator const_iterator;
typedef typename inner_container::reverse_iterator reverse_iterator;
typedef typename inner_container::const_reverse_iterator const_reverse_iterator;
typedef inner_container::key_type key_type;
typedef inner_container::key_compare key_compare;
typedef inner_container::allocator_type allocator_type;
typedef inner_container::size_type size_type;
typedef inner_container::difference_type difference_type;
typedef inner_container::pointer pointer;
typedef inner_container::const_pointer const_pointer;
typedef inner_container::reference reference;
typedef inner_container::const_reference const_reference;
typedef inner_container::iterator iterator;
typedef inner_container::const_iterator const_iterator;
typedef inner_container::reverse_iterator reverse_iterator;
typedef inner_container::const_reverse_iterator const_reverse_iterator;

/// <summary>
/// Constructs an empty set of HTTP headers.
Expand Down