Skip to content

Commit 65bde68

Browse files
hohonghohong
committed
fix linux build break 3
1 parent 0be1218 commit 65bde68

File tree

8 files changed

+24
-24
lines changed

8 files changed

+24
-24
lines changed

‎Release/include/interopstream.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ namespace Concurrency { namespace streams {
373373
}
374374
catch(...)
375375
{
376-
return (pos_type(std::_BADOFF));
376+
return (pos_type(-1));
377377
}
378378
}
379379

@@ -389,7 +389,7 @@ namespace Concurrency { namespace streams {
389389
}
390390
catch(...)
391391
{
392-
return (pos_type(std::_BADOFF));
392+
return (pos_type(-1));
393393
}
394394
}
395395

‎Release/include/rawptrstream.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ namespace Concurrency { namespace streams {
243243
/// </remarks>
244244
virtual bool acquire(_CharType*& ptr, size_t& count)
245245
{
246-
if (!can_read()) return false;
246+
if (!this->can_read()) return false;
247247

248248
count = in_avail();
249249

‎Release/tests/Common/UnitTestpp/src/TestRunner.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,11 @@ class TestRunner
8282

8383
int RunTests(TestList const& list, char const* suiteName, int defaultTestTimeInMs) const
8484
{
85-
RunTestsIf(list, suiteName, True(), defaultTestTimeInMs);
85+
return RunTestsIf(list, suiteName, True(), defaultTestTimeInMs);
8686
}
8787
int RunTests(TestList const& list, int defaultTestTimeInMs) const
8888
{
89-
RunTestsIf(list, nullptr, True(), defaultTestTimeInMs);
89+
return RunTestsIf(list, nullptr, True(), defaultTestTimeInMs);
9090
}
9191

9292
UNITTEST_LINKAGE TestResults* GetTestResults();

‎Release/tests/Functional/http/client/authentication_tests.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ TEST_FIXTURE(server_address, none_auth_with_basic_cred, "Ignore", "Manual")
336336
TEST_FIXTURE(server_address, successful_auth_with_domain_cred, "Ignore", "Manual")
337337
{
338338
// ACTION: fill in your domain credentials here temporarily to run.
339-
const string_t userName = U("DOMAIN\username");
339+
const string_t userName = U("DOMAIN\\username");
340340
const string_t password = U("");
341341

342342
http_client_config config;
@@ -351,7 +351,7 @@ TEST_FIXTURE(server_address, successful_auth_with_domain_cred, "Ignore", "Manual
351351
TEST_FIXTURE(server_address, none_auth_with_domain_cred, "Ignore", "Manual")
352352
{
353353
// ACTION: fill in your domain credentials here temporarily to run.
354-
const string_t userName = U("DOMAIN\username");
354+
const string_t userName = U("DOMAIN\\username");
355355
const string_t password = U("");
356356

357357
http_client_config config;
@@ -380,4 +380,4 @@ TEST_FIXTURE(uri_address, failed_authentication_attempt, "Ignore:Linux", "549349
380380

381381
} // SUITE(authentication_tests)
382382

383-
}}}}
383+
}}}}

‎Release/tests/Functional/http/utilities/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CXXFLAGS=$(LAX_BASE_CXXFLAGS) -I. -I$(CASABLANCA_INCLUDE_DIR) -I$(CASABLANCA_TESTS_DIR)/Common/UnitTestpp/ -I./testlistener/include -Iinclude -include linux_compat.h
1+
CXXFLAGS=$(LAX_BASE_CXXFLAGS) -I. -I$(CASABLANCA_INCLUDE_DIR) -I$(CASABLANCA_TESTS_DIR)/Common/UnitTestpp/ -I./testlistener/include -I$(CASABLANCA_TESTS_DIR)/Common/utilities/include -Iinclude -include linux_compat.h
22
LDFLAGS=-L$(CASABLANCA_TESTS_DIR)/Common/UnitTestpp/lib/linux_gcc/ -L"$(OUTPUT_DIR)" $(BASE_LDFLAGS)
33
LDLIBS=-lcasablanca -lunittestpp -lboost_system -lboost_thread -lboost_locale -lpthread -lstdc++
44

‎Release/tests/Functional/http/utilities/test_http_server.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ class _test_http_server
476476

477477
volatile std::atomic<int> m_cancel;
478478

479-
pplx::critical_section m_listen_lock;
479+
pplx::extensibility::critical_section_t m_listen_lock;
480480
public:
481481
_test_http_server(const utility::string_t& uri)
482482
: m_uri(uri)
@@ -500,13 +500,13 @@ class _test_http_server
500500
tr->m_body = result.extract_vector().get();
501501

502502
{
503-
pplx::critical_section::scoped_lock lock(m_lock);
503+
pplx::extensibility::critical_section_t::scoped_lock lock(m_lock);
504504
m_responding_requests[tr->m_request_id] = result;
505505
}
506506

507507
while (!m_cancel)
508508
{
509-
pplx::critical_section::scoped_lock lock(m_lock);
509+
pplx::extensibility::critical_section_t::scoped_lock lock(m_lock);
510510
if (m_requests.size() > 0)
511511
{
512512
m_requests[0].set(tr);
@@ -544,7 +544,7 @@ class _test_http_server
544544
{
545545
web::http::http_request request;
546546
{
547-
pplx::critical_section::scoped_lock lock(m_lock);
547+
pplx::extensibility::critical_section_t::scoped_lock lock(m_lock);
548548
auto it = m_responding_requests.find(request_id);
549549
if (it == m_responding_requests.end())
550550
throw std::runtime_error("no such request awaiting response");
@@ -572,7 +572,7 @@ class _test_http_server
572572
pplx::task<test_request *> next_request()
573573
{
574574
pplx::task_completion_event<test_request*> tce;
575-
pplx::critical_section::scoped_lock lock(m_lock);
575+
pplx::extensibility::critical_section_t::scoped_lock lock(m_lock);
576576
m_requests.push_back(tce);
577577
return pplx::create_task(tce);
578578
}

‎Release/tests/Functional/pplx/pplx_test/pplx_scheduler.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,13 @@ pplx::scheduler_interface& get_pplx_dflt_scheduler()
7878

7979
#else
8080

81-
class pplx_dflt_scheduler : public pplx::scheduler
81+
class pplx_dflt_scheduler : public pplx::scheduler_interface
8282
{
8383

8484
crossplat::threadpool m_pool;
8585

8686

87-
virtual void schedule(pplx::TaskProc proc, void* param)
87+
virtual void schedule(pplx::TaskProc_t proc, void* param)
8888
{
8989
pplx::details::atomic_increment(s_flag);
9090
m_pool.schedule([=]() -> void { proc(param); } );
@@ -97,7 +97,7 @@ class pplx_dflt_scheduler : public pplx::scheduler
9797

9898
pplx_dflt_scheduler g_pplx_dflt_scheduler;
9999

100-
pplx::scheduler& get_pplx_dflt_scheduler()
100+
pplx::scheduler_interface& get_pplx_dflt_scheduler()
101101
{
102102
return g_pplx_dflt_scheduler;
103103
}

‎Release/tests/Functional/streams/istream_tests.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1185,12 +1185,12 @@ template <typename _CharType, typename _LongType>
11851185
void istream_extract_long_impl(streambuf<_CharType> buf)
11861186
{
11871187
basic_istream<_CharType> is(buf);
1188-
const _LongType v1 = is.extract<_LongType>().get();
1189-
const _LongType v2 = is.extract<_LongType>().get();
1188+
const _LongType v1 = is.template extract<_LongType>().get();
1189+
const _LongType v2 = is.template extract<_LongType>().get();
11901190

11911191
VERIFY_ARE_EQUAL(123, v1);
11921192
VERIFY_ARE_EQUAL(-567, v2);
1193-
VERIFY_THROWS(is.extract<_LongType>().get(), std::runtime_error);
1193+
VERIFY_THROWS(is.template extract<_LongType>().get(), std::runtime_error);
11941194
}
11951195

11961196
TEST(istream_extract_long)
@@ -1205,12 +1205,12 @@ template <typename _CharType, typename _LongType>
12051205
void istream_extract_unsigned_long_impl(streambuf<_CharType> buf)
12061206
{
12071207
basic_istream<_CharType> is(buf);
1208-
const _LongType v1 = is.extract<_LongType>().get();
1209-
const _LongType v2 = is.extract<_LongType>().get();
1208+
const _LongType v1 = is.template extract<_LongType>().get();
1209+
const _LongType v2 = is.template extract<_LongType>().get();
12101210

12111211
VERIFY_ARE_EQUAL(876, v1);
12121212
VERIFY_ARE_EQUAL(3, v2);
1213-
VERIFY_THROWS(is.extract<_LongType>().get(), std::runtime_error);
1213+
VERIFY_THROWS(is.template extract<_LongType>().get(), std::runtime_error);
12141214
}
12151215

12161216
TEST(istream_extract_unsigned_long)
@@ -1410,4 +1410,4 @@ TEST(seek_after_eof)
14101410

14111411
} // SUITE(istream_tests)
14121412

1413-
}}}
1413+
}}}

0 commit comments

Comments
 (0)