Skip to content

Commit 2f97a9e

Browse files
committed
Merge branch 'feature_CasablancaUnreferencedParameter' of https://git01.codeplex.com/forks/les1966/unreferencedparameterfix into Les1966/UnreferencedParameterFix
2 parents 9977890 + 49b4a4c commit 2f97a9e

File tree

5 files changed

+12
-10
lines changed

5 files changed

+12
-10
lines changed

Release/include/compat/linux_compat.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ typedef struct _SYSTEMTIME {
8585

8686
#define YieldProcessor() __asm__ __volatile__ ("pause")
8787

88-
#define UNREFERENCED_PARAMETER(x) (void)x
88+
#define CASABLANCA_UNREFERENCED_PARAMETER(x) (void)x
8989
#define _ASSERTE(x) assert(x)
9090

9191
#ifdef CASABLANCA_DEPRECATION_NO_WARNINGS

Release/include/compat/windows_compat.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@
3838

3939
#define _noexcept
4040

41+
#define CASABLANCA_UNREFERENCED_PARAMETER(x) (x)
42+
4143
#ifdef CASABLANCA_DEPRECATION_NO_WARNINGS
4244
#define CASABLANCA_DEPRECATED(x)
4345
#else

Release/include/cpprest/http_windows_server.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ class http_overlapped : public OVERLAPPED
7878
ULONG_PTR numberOfBytesTransferred,
7979
PTP_IO io)
8080
{
81-
UNREFERENCED_PARAMETER(io);
82-
UNREFERENCED_PARAMETER(context);
83-
UNREFERENCED_PARAMETER(instance);
81+
CASABLANCA_UNREFERENCED_PARAMETER(io);
82+
CASABLANCA_UNREFERENCED_PARAMETER(context);
83+
CASABLANCA_UNREFERENCED_PARAMETER(instance);
8484

8585
http_overlapped *p_http_overlapped = (http_overlapped *)pOverlapped;
8686
p_http_overlapped->m_http_io_completion(result, (DWORD) numberOfBytesTransferred);

Release/include/pplx/ioscheduler.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ class io_scheduler
142142
/// </summary>
143143
void Disassociate(HANDLE fHandle, void *ctxt) const
144144
{
145-
UNREFERENCED_PARAMETER(fHandle);
145+
CASABLANCA_UNREFERENCED_PARAMETER(fHandle);
146146
CloseThreadpoolIo((PTP_IO)ctxt);
147147
}
148148

@@ -185,9 +185,9 @@ class io_scheduler
185185
ULONG_PTR numberOfBytesTransferred,
186186
PTP_IO io)
187187
{
188-
UNREFERENCED_PARAMETER(io);
189-
UNREFERENCED_PARAMETER(ctxt);
190-
UNREFERENCED_PARAMETER(instance);
188+
CASABLANCA_UNREFERENCED_PARAMETER(io);
189+
CASABLANCA_UNREFERENCED_PARAMETER(ctxt);
190+
CASABLANCA_UNREFERENCED_PARAMETER(instance);
191191

192192
if ( pOverlapped != nullptr )
193193
{

Release/src/http/client/http_win7.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ class winhttp_client : public _http_client_communicator
322322
unsigned long report_failure(const utility::string_t& errorMessage)
323323
{
324324
// Should we log?
325-
UNREFERENCED_PARAMETER(errorMessage);
325+
CASABLANCA_UNREFERENCED_PARAMETER(errorMessage);
326326

327327
return GetLastError();
328328
}
@@ -1026,7 +1026,7 @@ class winhttp_client : public _http_client_communicator
10261026
_In_ void* statusInfo,
10271027
DWORD statusInfoLength)
10281028
{
1029-
UNREFERENCED_PARAMETER(statusInfoLength);
1029+
CASABLANCA_UNREFERENCED_PARAMETER(statusInfoLength);
10301030

10311031
if ( statusCode == WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING )
10321032
return;

0 commit comments

Comments
 (0)