fix linux build break 3

hohong · hohong · commit 65bde683c3a9 · 2013-04-30T15:42:04.000-07:00
diff --git a/Release/include/interopstream.h b/Release/include/interopstream.h
@@ -373,7 +373,7 @@ namespace Concurrency { namespace streams {
         }
 			catch(...)
 			{
-				return (pos_type(std::_BADOFF));
+				return (pos_type(-1));
 			}
         }
 
@@ -389,7 +389,7 @@ namespace Concurrency { namespace streams {
         }
 			catch(...)
 			{
-				return (pos_type(std::_BADOFF));
+				return (pos_type(-1));
 			}
         }
 
diff --git a/Release/include/rawptrstream.h b/Release/include/rawptrstream.h
@@ -243,7 +243,7 @@ namespace Concurrency { namespace streams {
         /// </remarks>
         virtual bool acquire(_CharType*& ptr, size_t& count)
         {
-            if (!can_read()) return false;
+            if (!this->can_read()) return false;
 
             count = in_avail();
 
diff --git a/Release/tests/Common/UnitTestpp/src/TestRunner.h b/Release/tests/Common/UnitTestpp/src/TestRunner.h
@@ -82,11 +82,11 @@ class TestRunner
 
     int RunTests(TestList const& list, char const* suiteName, int defaultTestTimeInMs) const
     {
-        RunTestsIf(list, suiteName, True(), defaultTestTimeInMs);
+        return RunTestsIf(list, suiteName, True(), defaultTestTimeInMs);
     }
 	int RunTests(TestList const& list, int defaultTestTimeInMs) const
     {
-        RunTestsIf(list, nullptr, True(), defaultTestTimeInMs);
+        return RunTestsIf(list, nullptr, True(), defaultTestTimeInMs);
     }
 
 	UNITTEST_LINKAGE TestResults* GetTestResults();
diff --git a/Release/tests/Functional/http/client/authentication_tests.cpp b/Release/tests/Functional/http/client/authentication_tests.cpp
@@ -336,7 +336,7 @@ TEST_FIXTURE(server_address, none_auth_with_basic_cred, "Ignore", "Manual")
 TEST_FIXTURE(server_address, successful_auth_with_domain_cred, "Ignore", "Manual")
 {
 	// ACTION: fill in your domain credentials here temporarily to run.
-	const string_t userName = U("DOMAIN\username");
+	const string_t userName = U("DOMAIN\\username");
 	const string_t password = U("");
 
 	http_client_config config;
@@ -351,7 +351,7 @@ TEST_FIXTURE(server_address, successful_auth_with_domain_cred, "Ignore", "Manual
 TEST_FIXTURE(server_address, none_auth_with_domain_cred, "Ignore", "Manual")
 {
 	// ACTION: fill in your domain credentials here temporarily to run.
-	const string_t userName = U("DOMAIN\username");
+	const string_t userName = U("DOMAIN\\username");
 	const string_t password = U("");
 
 	http_client_config config;
@@ -380,4 +380,4 @@ TEST_FIXTURE(uri_address, failed_authentication_attempt, "Ignore:Linux", "549349
 
 } // SUITE(authentication_tests)
 
-}}}}
+}}}}
diff --git a/Release/tests/Functional/http/utilities/Makefile b/Release/tests/Functional/http/utilities/Makefile
@@ -1,4 +1,4 @@
-CXXFLAGS=$(LAX_BASE_CXXFLAGS) -I. -I$(CASABLANCA_INCLUDE_DIR) -I$(CASABLANCA_TESTS_DIR)/Common/UnitTestpp/ -I./testlistener/include -Iinclude -include linux_compat.h
+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
 LDFLAGS=-L$(CASABLANCA_TESTS_DIR)/Common/UnitTestpp/lib/linux_gcc/ -L"$(OUTPUT_DIR)" $(BASE_LDFLAGS)
 LDLIBS=-lcasablanca -lunittestpp -lboost_system -lboost_thread -lboost_locale -lpthread -lstdc++
 
diff --git a/Release/tests/Functional/http/utilities/test_http_server.cpp b/Release/tests/Functional/http/utilities/test_http_server.cpp
@@ -476,7 +476,7 @@ class _test_http_server
 
     volatile std::atomic<int> m_cancel;
 
-    pplx::critical_section m_listen_lock;
+	pplx::extensibility::critical_section_t m_listen_lock;
 public:
     _test_http_server(const utility::string_t& uri)
         : m_uri(uri) 
@@ -500,13 +500,13 @@ class _test_http_server
             tr->m_body = result.extract_vector().get();
 
             {
-                pplx::critical_section::scoped_lock lock(m_lock);
+                pplx::extensibility::critical_section_t::scoped_lock lock(m_lock);
                 m_responding_requests[tr->m_request_id] = result;
             }
 
             while (!m_cancel)
             {
-                pplx::critical_section::scoped_lock lock(m_lock);
+                pplx::extensibility::critical_section_t::scoped_lock lock(m_lock);
                 if (m_requests.size() > 0)
                 {
                     m_requests[0].set(tr);
@@ -544,7 +544,7 @@ class _test_http_server
     {
         web::http::http_request request;
         {
-            pplx::critical_section::scoped_lock lock(m_lock);
+            pplx::extensibility::critical_section_t::scoped_lock lock(m_lock);
             auto it = m_responding_requests.find(request_id);
             if (it == m_responding_requests.end())
                 throw std::runtime_error("no such request awaiting response");
@@ -572,7 +572,7 @@ class _test_http_server
     pplx::task<test_request *> next_request()
     {
         pplx::task_completion_event<test_request*> tce;
-        pplx::critical_section::scoped_lock lock(m_lock);
+        pplx::extensibility::critical_section_t::scoped_lock lock(m_lock);
         m_requests.push_back(tce);
         return pplx::create_task(tce);
     }
diff --git a/Release/tests/Functional/pplx/pplx_test/pplx_scheduler.cpp b/Release/tests/Functional/pplx/pplx_test/pplx_scheduler.cpp
@@ -78,13 +78,13 @@ pplx::scheduler_interface& get_pplx_dflt_scheduler()
 
 #else
 
-class pplx_dflt_scheduler : public pplx::scheduler
+class pplx_dflt_scheduler : public pplx::scheduler_interface
 {
 
     crossplat::threadpool m_pool;
 
 
-    virtual void schedule(pplx::TaskProc proc, void* param)
+    virtual void schedule(pplx::TaskProc_t proc, void* param)
     {
         pplx::details::atomic_increment(s_flag);
         m_pool.schedule([=]() -> void { proc(param); } );
@@ -97,7 +97,7 @@ class pplx_dflt_scheduler : public pplx::scheduler
 
 pplx_dflt_scheduler g_pplx_dflt_scheduler;
 
-pplx::scheduler& get_pplx_dflt_scheduler()
+pplx::scheduler_interface& get_pplx_dflt_scheduler()
 {
     return g_pplx_dflt_scheduler;
 }
diff --git a/Release/tests/Functional/streams/istream_tests.cpp b/Release/tests/Functional/streams/istream_tests.cpp
@@ -1185,12 +1185,12 @@ template <typename _CharType, typename _LongType>
 void istream_extract_long_impl(streambuf<_CharType> buf)
 {
     basic_istream<_CharType> is(buf);
-    const _LongType v1 = is.extract<_LongType>().get();
-    const _LongType v2 = is.extract<_LongType>().get();
+    const _LongType v1 = is.template extract<_LongType>().get();
+    const _LongType v2 = is.template extract<_LongType>().get();
 
     VERIFY_ARE_EQUAL(123, v1);
     VERIFY_ARE_EQUAL(-567, v2);
-    VERIFY_THROWS(is.extract<_LongType>().get(), std::runtime_error);
+    VERIFY_THROWS(is.template extract<_LongType>().get(), std::runtime_error);
 }
 
 TEST(istream_extract_long)
@@ -1205,12 +1205,12 @@ template <typename _CharType, typename _LongType>
 void istream_extract_unsigned_long_impl(streambuf<_CharType> buf)
 {
     basic_istream<_CharType> is(buf);
-    const _LongType v1 = is.extract<_LongType>().get();
-    const _LongType v2 = is.extract<_LongType>().get();
+    const _LongType v1 = is.template extract<_LongType>().get();
+    const _LongType v2 = is.template extract<_LongType>().get();
 
     VERIFY_ARE_EQUAL(876, v1);
     VERIFY_ARE_EQUAL(3, v2);
-    VERIFY_THROWS(is.extract<_LongType>().get(), std::runtime_error);
+    VERIFY_THROWS(is.template extract<_LongType>().get(), std::runtime_error);
 }
 
 TEST(istream_extract_unsigned_long)
@@ -1410,4 +1410,4 @@ TEST(seek_after_eof)
 
 } // SUITE(istream_tests)
 
-}}}
+}}}

Original file line number	Diff line number	Diff line change
`@@ -373,7 +373,7 @@ namespace Concurrency { namespace streams {`
`373`	`373`	`}`
`374`	`374`	`catch(...)`
`375`	`375`	`{`
`376`		`- return (pos_type(std::_BADOFF));`
	`376`	`+ return (pos_type(-1));`
`377`	`377`	`}`
`378`	`378`	`}`
`379`	`379`
`@@ -389,7 +389,7 @@ namespace Concurrency { namespace streams {`
`389`	`389`	`}`
`390`	`390`	`catch(...)`
`391`	`391`	`{`
`392`		`- return (pos_type(std::_BADOFF));`
	`392`	`+ return (pos_type(-1));`
`393`	`393`	`}`
`394`	`394`	`}`
`395`	`395`
Original file line number	Diff line number	Diff line change
`@@ -243,7 +243,7 @@ namespace Concurrency { namespace streams {`
`243`	`243`	`/// </remarks>`
`244`	`244`	`virtual bool acquire(_CharType*& ptr, size_t& count)`
`245`	`245`	`{`
`246`		`- if (!can_read()) return false;`
	`246`	`+ if (!this->can_read()) return false;`
`247`	`247`
`248`	`248`	`count = in_avail();`
`249`	`249`
Original file line number	Diff line number	Diff line change
`@@ -82,11 +82,11 @@ class TestRunner`
`82`	`82`
`83`	`83`	`int RunTests(TestList const& list, char const* suiteName, int defaultTestTimeInMs) const`
`84`	`84`	`{`
`85`		`- RunTestsIf(list, suiteName, True(), defaultTestTimeInMs);`
	`85`	`+ return RunTestsIf(list, suiteName, True(), defaultTestTimeInMs);`
`86`	`86`	`}`
`87`	`87`	`int RunTests(TestList const& list, int defaultTestTimeInMs) const`
`88`	`88`	`{`
`89`		`- RunTestsIf(list, nullptr, True(), defaultTestTimeInMs);`
	`89`	`+ return RunTestsIf(list, nullptr, True(), defaultTestTimeInMs);`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`UNITTEST_LINKAGE TestResults* GetTestResults();`
Original file line number	Diff line number	Diff 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`
`2`	`2`	`LDFLAGS=-L$(CASABLANCA_TESTS_DIR)/Common/UnitTestpp/lib/linux_gcc/ -L"$(OUTPUT_DIR)" $(BASE_LDFLAGS)`
`3`	`3`	`LDLIBS=-lcasablanca -lunittestpp -lboost_system -lboost_thread -lboost_locale -lpthread -lstdc++`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -476,7 +476,7 @@ class _test_http_server`
`476`	`476`
`477`	`477`	`volatile std::atomic<int> m_cancel;`
`478`	`478`
`479`		`- pplx::critical_section m_listen_lock;`
	`479`	`+ pplx::extensibility::critical_section_t m_listen_lock;`
`480`	`480`	`public:`
`481`	`481`	`_test_http_server(const utility::string_t& uri)`
`482`	`482`	`: m_uri(uri)`
`@@ -500,13 +500,13 @@ class _test_http_server`
`500`	`500`	`tr->m_body = result.extract_vector().get();`
`501`	`501`
`502`	`502`	`{`
`503`		`- pplx::critical_section::scoped_lock lock(m_lock);`
	`503`	`+ pplx::extensibility::critical_section_t::scoped_lock lock(m_lock);`
`504`	`504`	`m_responding_requests[tr->m_request_id] = result;`
`505`	`505`	`}`
`506`	`506`
`507`	`507`	`while (!m_cancel)`
`508`	`508`	`{`
`509`		`- pplx::critical_section::scoped_lock lock(m_lock);`
	`509`	`+ pplx::extensibility::critical_section_t::scoped_lock lock(m_lock);`
`510`	`510`	`if (m_requests.size() > 0)`
`511`	`511`	`{`
`512`	`512`	`m_requests[0].set(tr);`
`@@ -544,7 +544,7 @@ class _test_http_server`
`544`	`544`	`{`
`545`	`545`	`web::http::http_request request;`
`546`	`546`	`{`
`547`		`- pplx::critical_section::scoped_lock lock(m_lock);`
	`547`	`+ pplx::extensibility::critical_section_t::scoped_lock lock(m_lock);`
`548`	`548`	`auto it = m_responding_requests.find(request_id);`
`549`	`549`	`if (it == m_responding_requests.end())`
`550`	`550`	`throw std::runtime_error("no such request awaiting response");`
`@@ -572,7 +572,7 @@ class _test_http_server`
`572`	`572`	`pplx::task<test_request *> next_request()`
`573`	`573`	`{`
`574`	`574`	`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);`
`576`	`576`	`m_requests.push_back(tce);`
`577`	`577`	`return pplx::create_task(tce);`
`578`	`578`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,13 +78,13 @@ pplx::scheduler_interface& get_pplx_dflt_scheduler()`
`78`	`78`
`79`	`79`	`#else`
`80`	`80`
`81`		`-class pplx_dflt_scheduler : public pplx::scheduler`
	`81`	`+class pplx_dflt_scheduler : public pplx::scheduler_interface`
`82`	`82`	`{`
`83`	`83`
`84`	`84`	`crossplat::threadpool m_pool;`
`85`	`85`
`86`	`86`
`87`		`- virtual void schedule(pplx::TaskProc proc, void* param)`
	`87`	`+ virtual void schedule(pplx::TaskProc_t proc, void* param)`
`88`	`88`	`{`
`89`	`89`	`pplx::details::atomic_increment(s_flag);`
`90`	`90`	`m_pool.schedule([=]() -> void { proc(param); } );`
`@@ -97,7 +97,7 @@ class pplx_dflt_scheduler : public pplx::scheduler`
`97`	`97`
`98`	`98`	`pplx_dflt_scheduler g_pplx_dflt_scheduler;`
`99`	`99`
`100`		`-pplx::scheduler& get_pplx_dflt_scheduler()`
	`100`	`+pplx::scheduler_interface& get_pplx_dflt_scheduler()`
`101`	`101`	`{`
`102`	`102`	`return g_pplx_dflt_scheduler;`
`103`	`103`	`}`