Fix compilation failure with CPPREST_FORCE_PPLX=1 (resolves #734) (#746)

* Make sure internal _do_while is in the same namespace as other pplx tasks implementation details (resolves #734)

* Reformat astreambuf.h line endings

Author: garethsb

Release/include/cpprest/astreambuf.h

@@ -22,7 +22,11 @@
 #include "cpprest/details/basic_types.h"
 #include "cpprest/asyncrt_utils.h"
 
-namespace Concurrency
+#if (defined(_MSC_VER) && (_MSC_VER >= 1800)) && !CPPREST_FORCE_PPLX
+namespace Concurrency // since namespace pplx = Concurrency
+#else
+namespace pplx
+#endif
 {
     namespace details
     {
@@ -32,12 +36,16 @@ namespace Concurrency
             pplx::task<T> first = func();
             return first.then([=](bool guard) -> pplx::task<T> {
                 if (guard)
-                    return Concurrency::details::_do_while<F,T>(func);
+                    return pplx::details::_do_while<F,T>(func);
                 else
                     return first;
             });
         }
     }
+}
+
+namespace Concurrency
+{
 
 /// Library for asynchronous streams.
 namespace streams
@@ -1201,4 +1209,4 @@ namespace streams
 
 }}
 
-
+

Release/include/cpprest/streams.h

@@ -801,7 +801,7 @@ namespace Concurrency { namespace streams
                     return true;
                 };
 
-            auto loop = Concurrency::details::_do_while([=]() mutable -> pplx::task<bool>
+            auto loop = pplx::details::_do_while([=]() mutable -> pplx::task<bool>
                 {
                     while (buffer.in_avail() > 0)
                     {
@@ -888,7 +888,7 @@ namespace Concurrency { namespace streams
                     return pplx::task_from_result(false);
                 };
 
-            auto loop = Concurrency::details::_do_while([=]() mutable -> pplx::task<bool>
+            auto loop = pplx::details::_do_while([=]() mutable -> pplx::task<bool>
                 {
                     while ( buffer.in_avail() > 0 )
                     {
@@ -968,7 +968,7 @@ namespace Concurrency { namespace streams
                 });
             };
 
-            auto loop = Concurrency::details::_do_while(copy_to_target);
+            auto loop = pplx::details::_do_while(copy_to_target);
 
             return loop.then([=](bool) mutable -> size_t
                 {
@@ -1142,7 +1142,7 @@ pplx::task<void> _type_parser_base<CharType>::_skip_whitespace(streams::streambu
             return false;
         };
 
-    auto loop = Concurrency::details::_do_while([=]() mutable -> pplx::task<bool>
+    auto loop = pplx::details::_do_while([=]() mutable -> pplx::task<bool>
         {
             while (buffer.in_avail() > 0)
             {
@@ -1217,7 +1217,7 @@ pplx::task<ReturnType> _type_parser_base<CharType>::_parse_input(
     return _skip_whitespace(buffer).then([=](pplx::task<void> op) -> pplx::task<ReturnType>
         {
             op.wait();
-            return Concurrency::details::_do_while(peek_char).then(finish);
+            return pplx::details::_do_while(peek_char).then(finish);
         });
 }
 

Release/tests/functional/streams/istream_tests.cpp

@@ -714,7 +714,7 @@ TEST(fstream_read_to_end_3)
             else
                 return pplx::task_from_result(false);
         };
-    Concurrency::details::_do_while([=]()-> pplx::task<bool> {
+    pplx::details::_do_while([=]()-> pplx::task<bool> {
         return stream.read().then(lambda1);
     }).wait();
 

Release/tests/functional/streams/memstream_tests.cpp

@@ -48,7 +48,7 @@ void streambuf_putc(StreamBufferType& wbuf)
     size_t count = 10;
     auto seg2 = [&count](typename StreamBufferType::int_type ) { return (--count > 0); };
     auto seg1 = [&s,&wbuf, seg2]() { return wbuf.putc(s[0]).then(seg2); };
-    Concurrency::details::_do_while(seg1).wait();
+    pplx::details::_do_while(seg1).wait();
 
     VERIFY_ARE_EQUAL(s.size() + 10, wbuf.in_avail());
 
@@ -83,7 +83,7 @@ void streambuf_putc(concurrency::streams::rawptr_buffer<CharType>& wbuf)
     size_t count = 10;
     auto seg2 = [&count](typename StreamBufferType::int_type ) { return (--count > 0); };
     auto seg1 = [&s,&wbuf, seg2]() { return wbuf.putc(s[0]).then(seg2); };
-    Concurrency::details::_do_while(seg1).wait();
+    pplx::details::_do_while(seg1).wait();
 
     VERIFY_ARE_EQUAL(s.size() + 10, wbuf.block().size());
 
@@ -119,7 +119,7 @@ void streambuf_putc(concurrency::streams::container_buffer<CollectionType>& wbuf
     size_t count = 10;
     auto seg2 = [&count](typename StreamBufferType::int_type ) { return (--count > 0); };
     auto seg1 = [&s,&wbuf, seg2]() { return wbuf.putc(s[0]).then(seg2); };
-    Concurrency::details::_do_while(seg1).wait();
+    pplx::details::_do_while(seg1).wait();
 
     VERIFY_ARE_EQUAL(s.size() + 10, wbuf.collection().size());
 
@@ -150,7 +150,7 @@ void streambuf_putn(StreamBufferType& wbuf)
     int count = 10;
     auto seg2 = [&count](size_t ) { return (--count > 0); };
     auto seg1 = [&s,&wbuf, seg2]() { return wbuf.putn_nocopy(s.data(), s.size()).then(seg2); };
-    Concurrency::details::_do_while(seg1).wait();
+    pplx::details::_do_while(seg1).wait();
     VERIFY_ARE_EQUAL(s.size() * 12, wbuf.in_avail());
 
     wbuf.close().get();
@@ -180,7 +180,7 @@ void streambuf_putn(concurrency::streams::rawptr_buffer<CharType>& wbuf)
     int count = 10;
     auto seg2 = [&count](size_t ) { return (--count > 0); };
     auto seg1 = [&s,&wbuf, seg2]() { return wbuf.putn_nocopy(s.data(), s.size()).then(seg2); };
-    Concurrency::details::_do_while(seg1).wait();
+    pplx::details::_do_while(seg1).wait();
 
     wbuf.close().get();
     VERIFY_IS_FALSE(wbuf.can_write());
@@ -209,7 +209,7 @@ void streambuf_putn(concurrency::streams::container_buffer<CollectionType>& wbuf
     int count = 10;
     auto seg2 = [&count](size_t ) { return (--count > 0); };
     auto seg1 = [&s,&wbuf, seg2]() { return wbuf.putn_nocopy(s.data(), s.size()).then(seg2); };
-    Concurrency::details::_do_while(seg1).wait();
+    pplx::details::_do_while(seg1).wait();
 
     wbuf.close().get();
     VERIFY_IS_FALSE(wbuf.can_write());
@@ -1935,7 +1935,7 @@ void IStreamTest11()
     auto seg2 = [&ch](int val) { return (val != -1) && (++ch <= 'z'); };
     auto seg1 = [=,&ch,&rbuf]() { return rbuf.putc(ch).then(seg2); };
 
-    Concurrency::details::_do_while(seg1).wait();
+    pplx::details::_do_while(seg1).wait();
 
     VERIFY_ARE_EQUAL(26u, rbuf.in_avail());