Skip to content

Fixed non-conformant extra qualification on member function declarations #422

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.

Sign up for GitHub

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

Closed
wants to merge 1 commit into from
Closed

Fixed non-conformant extra qualification on member function declarations #422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Fixed non-conformant extra qualification on member function declarati… 
…ons.
  • Loading branch information
VTT committed Apr 21, 2017
commit b0817d94128b56d29776d3f7bc5bb5df64b66898
2 changes: 1 addition & 1 deletion Release/include/cpprest/asyncrt_utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ class datetime

#ifdef _WIN32
// void* to avoid pulling in windows.h
static _ASYNCRTIMP bool __cdecl datetime::system_type_to_datetime(/*SYSTEMTIME*/ void* psysTime, uint64_t seconds, datetime * pdt);
static _ASYNCRTIMP bool __cdecl system_type_to_datetime(/*SYSTEMTIME*/ void* psysTime, uint64_t seconds, datetime * pdt);
#else
static datetime timeval_to_datetime(const timeval &time);
#endif
Expand Down
4 changes: 2 additions & 2 deletions Release/include/pplx/pplxwin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ namespace details
_ASSERTE(_M_recursionCount == 0);
}

void recursive_lock_impl::lock()
void lock()
{
auto id = ::pplx::details::platform::GetCurrentThreadId();

Expand All @@ -200,7 +200,7 @@ namespace details
}
}

void recursive_lock_impl::unlock()
void unlock()
{
_ASSERTE(_M_owner == ::pplx::details::platform::GetCurrentThreadId());
_ASSERTE(_M_recursionCount >= 1);
Expand Down