Skip to content

Commit 633873c

Browse files
committed
fix linux build break after merge from nativecloud
1 parent e25c3de commit 633873c

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

Release/include/pplx/pplxcancellation_token.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ namespace details
149149
// Returns the new reference count.
150150
long _Reference()
151151
{
152-
long _Refcount = _InterlockedIncrement(&_M_refCount);
152+
long _Refcount = atomic_increment(_M_refCount);
153153

154154
// 0 - 1 transition is illegal
155155
_ASSERTE(_Refcount > 1);
@@ -160,7 +160,7 @@ namespace details
160160
// Returns the new reference count
161161
long _Release()
162162
{
163-
long _Refcount = _InterlockedDecrement(&_M_refCount);
163+
long _Refcount = atomic_decrement(_M_refCount);
164164
_ASSERTE(_Refcount >= 0);
165165

166166
if (_Refcount == 0)
@@ -186,7 +186,7 @@ namespace details
186186
}
187187

188188
// Reference count
189-
volatile long _M_refCount;
189+
atomic_long _M_refCount;
190190
};
191191

192192
class _CancellationTokenState;
@@ -413,7 +413,7 @@ namespace details
413413

414414
public:
415415

416-
static _CancellationTokenState * _CancellationTokenState::_NewTokenState()
416+
static _CancellationTokenState * _NewTokenState()
417417
{
418418
return new _CancellationTokenState();
419419
}

Release/include/pplx/pplxtasks.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2505,7 +2505,7 @@ namespace details
25052505
{
25062506
::pplx::extensibility::scoped_critical_section_t _LockHolder(_M_ContinuationsCritSec);
25072507
// Canceled state could only result from antecedent task's canceled state, but that code path will not reach here.
2508-
_ASSERT(!_IsCanceled());
2508+
_ASSERTE(!_IsCanceled());
25092509
if (_IsPendingCancel())
25102510
return false;
25112511

Release/tests/Functional/http/listener/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ OUTPUT_DIR?=./$(MODE)
66

77
$(OUTPUT_DIR)/httplistener_test.so: \
88
building_response_tests.cpp \
9-
connection_tests.cpp \
9+
connections_and_errors.cpp \
1010
header_tests.cpp \
1111
listener_construction_tests.cpp \
1212
pipeline_stage_tests.cpp \

Release/tests/Functional/http/listener/connections_and_errors.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
#include "stdafx.h"
1717

18-
#include <cpprest\http_client.h>
18+
#include <cpprest/http_client.h>
1919

2020
using namespace utility;
2121
using namespace web;

0 commit comments

Comments
 (0)