Skip to content

Commit c401809

Browse files
committed
Addressed code review comments.
1 parent 1c3061b commit c401809

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

Release/include/cpprest/asyncrt_utils.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -250,11 +250,11 @@ namespace details
250250
class windows_category_impl : public std::error_category
251251
{
252252
public:
253-
virtual const char *name() const _NOEXCEPT { return "windows"; }
253+
virtual const char *name() const _noexcept { return "windows"; }
254254

255-
_ASYNCRTIMP virtual std::string message(int errorCode) const _NOEXCEPT;
255+
_ASYNCRTIMP virtual std::string message(int errorCode) const _noexcept;
256256

257-
_ASYNCRTIMP virtual std::error_condition default_error_condition(int errorCode) const _NOEXCEPT;
257+
_ASYNCRTIMP virtual std::error_condition default_error_condition(int errorCode) const _noexcept;
258258
};
259259

260260
/// <summary>

Release/include/pplx/ioscheduler.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ class io_scheduler
149149
/// <summary>
150150
/// Get the I/O completion key to use with the scheduler.
151151
/// </summary>
152-
DWORD get_key() const { return (((DWORD)(uintptr_t)this) & 0xFAFAFA00) + sizeof(EXTENDED_OVERLAPPED); }
152+
DWORD get_key() const { return (static_cast<DWORD>((uintptr_t)this) & 0xFAFAFA00) + sizeof(EXTENDED_OVERLAPPED); }
153153

154154
/// <summary>
155155
/// Get the I/O scheduler instance.

Release/src/build/vs14/casablanca140.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
</ItemGroup>
4141
<ItemDefinitionGroup>
4242
<ClCompile>
43-
<PreprocessorDefinitions>_ASYNCRT_EXPORT;AZURESTORAGESERVICES_EXPORTS;_PPLX_EXPORT;WIN32;_MBCS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
43+
<PreprocessorDefinitions>_ASYNCRT_EXPORT;_PPLX_EXPORT;WIN32;_MBCS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
4444
<AdditionalIncludeDirectories>$(CasablancaIncludeDir);$(CasablancaSrcDir)\pch;$(WebsocketppIncludeDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
4545
<PrecompiledHeader>Use</PrecompiledHeader>
4646
<PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>

Release/src/utilities/asyncrt_utils.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ const std::error_category & __cdecl windows_category()
177177
return instance;
178178
}
179179

180-
std::string windows_category_impl::message(int errorCode) const _NOEXCEPT
180+
std::string windows_category_impl::message(int errorCode) const _noexcept
181181
{
182182
const size_t buffer_size = 4096;
183183
DWORD dwFlags = FORMAT_MESSAGE_FROM_SYSTEM;
@@ -213,7 +213,7 @@ std::string windows_category_impl::message(int errorCode) const _NOEXCEPT
213213
return utility::conversions::to_utf8string(buffer);
214214
}
215215

216-
std::error_condition windows_category_impl::default_error_condition(int errorCode) const _NOEXCEPT
216+
std::error_condition windows_category_impl::default_error_condition(int errorCode) const _noexcept
217217
{
218218
// First see if the STL implementation can handle the mapping for common cases.
219219
const std::error_condition errCondition = std::system_category().default_error_condition(errorCode);

Release/tests/functional/http/client/proxy_tests.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ TEST_FIXTURE(uri_address, proxy_with_credentials, "Ignore:Linux", "NYI", "Ignore
113113
VERIFY_ARE_EQUAL(status_codes::OK, response.status_code());
114114
response.content_ready().wait();
115115
}
116-
catch (web::http::http_exception& e)
116+
catch (web::http::http_exception const& e)
117117
{
118118
if (e.error_code().value() == 12007) {
119119
// The above "netproxy.redmond.corp.microsoft.com" is an internal site not generally accessible.

0 commit comments

Comments
 (0)