Skip to content

Commit 381f5aa

Browse files
committed
Merge pull request microsoft#422
Fixed non-conformant extra qualification on member function declarations
2 parents 67e4d62 + 31b0e47 commit 381f5aa

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Release/include/cpprest/asyncrt_utils.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -580,7 +580,7 @@ class datetime
580580

581581
#ifdef _WIN32
582582
// void* to avoid pulling in windows.h
583-
static _ASYNCRTIMP bool __cdecl datetime::system_type_to_datetime(/*SYSTEMTIME*/ void* psysTime, uint64_t seconds, datetime * pdt);
583+
static _ASYNCRTIMP bool __cdecl system_type_to_datetime(/*SYSTEMTIME*/ void* psysTime, uint64_t seconds, datetime * pdt);
584584
#else
585585
static datetime timeval_to_datetime(const timeval &time);
586586
#endif

Release/include/pplx/pplxwin.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ namespace details
172172
_ASSERTE(_M_recursionCount == 0);
173173
}
174174

175-
void recursive_lock_impl::lock()
175+
void lock()
176176
{
177177
auto id = ::pplx::details::platform::GetCurrentThreadId();
178178

@@ -188,7 +188,7 @@ namespace details
188188
}
189189
}
190190

191-
void recursive_lock_impl::unlock()
191+
void unlock()
192192
{
193193
_ASSERTE(_M_owner == ::pplx::details::platform::GetCurrentThreadId());
194194
_ASSERTE(_M_recursionCount >= 1);

0 commit comments

Comments
 (0)