fix linux build break 1

Author: hohong

Release/include/http_client.h

@@ -258,7 +258,7 @@ class http_client
     /// <param name="handler">A function object representing the pipeline stage.</param>
     void add_handler(std::function<pplx::task<http_response>(http_request, std::shared_ptr<http::http_pipeline_stage>)> handler)
     {
-        m_pipeline->append(std::make_shared<::web::http::details::function_pipeline_wrapper>(handler));
+        m_pipeline->append(std::make_shared< ::web::http::details::function_pipeline_wrapper>(handler));
     }
 
 	/// <summary>
@@ -388,7 +388,7 @@ class http_client
 
     void build_pipeline(const uri &base_uri, const http_client_config& client_config);
 
-    std::shared_ptr<::web::http::http_pipeline> m_pipeline;
+    std::shared_ptr< ::web::http::http_pipeline> m_pipeline;
 };
 
 } // namespace client

Release/include/pplxcancellation_token.h

@@ -62,7 +62,7 @@ namespace details
         // Returns the new reference count.
         long _Reference()
         {
-            long _Refcount = _InterlockedIncrement(&_M_refCount);
+            long _Refcount = atomic_increment(_M_refCount);
 
             // 0 - 1 transition is illegal
             _ASSERTE(_Refcount > 1);
@@ -73,7 +73,7 @@ namespace details
         // Returns the new reference count
         long _Release()
         {
-            long _Refcount = _InterlockedDecrement(&_M_refCount);
+            long _Refcount = atomic_decrement(_M_refCount);
             _ASSERTE(_Refcount >= 0);
 
             if (_Refcount == 0)
@@ -99,7 +99,7 @@ namespace details
         }
 
         // Reference count
-        volatile long _M_refCount;
+        atomic_long _M_refCount;
     };
 
     class _CancellationTokenState;
@@ -319,7 +319,7 @@ namespace details
 
     public:
 
-        static _CancellationTokenState * _CancellationTokenState::_NewTokenState()
+        static _CancellationTokenState * _NewTokenState()
         {
             return new _CancellationTokenState();
         }
@@ -607,6 +607,7 @@ class cancellation_token_registration
 };
 
 
+class invalid_operation;
 /// <summary>
 ///     The <c>cancellation_token</c> class represents the ability to determine whether some operation has been requested to cancel.  A given token can
 ///     be associated with a <c>task_group</c>, <c>structured_task_group</c>, or <c>task</c> to provide implicit cancellation.  It can also be polled for

Release/include/pplxlinux.h

@@ -251,7 +251,7 @@ namespace platform
 
         ~timer_impl();
 
-        _PPLXIMP void start(unsigned int ms, bool repeat, TaskProc userFunc, _In_ void * context);
+        _PPLXIMP void start(unsigned int ms, bool repeat, TaskProc_t userFunc, _In_ void * context);
         _PPLXIMP void stop(bool waitForCallbacks);
 
     private:
@@ -261,7 +261,7 @@ namespace platform
     class linux_scheduler : public pplx::scheduler_interface
     {
     public:
-        _PPLXIMP virtual void schedule( TaskProc proc, _In_ void* param);
+        _PPLXIMP virtual void schedule( TaskProc_t proc, _In_ void* param);
     };
 
     /// <summary>
@@ -306,7 +306,7 @@ namespace extensibility
 
     typedef ::pplx::details::reader_writer_lock_impl reader_writer_lock_t;
     typedef scoped_lock<reader_writer_lock_t> scoped_rw_lock_t;
-    typedef ::pplx::reader_writer_lock::scoped_lock_read scoped_read_lock_t;
+    typedef ::pplx::extensibility::reader_writer_lock_t::scoped_lock_read scoped_read_lock_t;
 
     typedef ::pplx::details::recursive_lock_impl recursive_lock_t;
     typedef scoped_lock<recursive_lock_t> scoped_recursive_lock_t;

Release/include/pplxtasks.h

@@ -847,7 +847,7 @@ namespace details
 
     // Specializations to avoid marshaling for strings and arrays.
     template<typename _Type>
-    struct _MarshalHelper<::Platform::Array<_Type^>>
+    struct _MarshalHelper< ::Platform::Array<_Type^>>
     {
         static ::Platform::Array<_Type^>^ _Perform(::Platform::Array<_Type^>^& _ObjInCtx, const _ContextCallback& _Ctx)
         {
@@ -856,7 +856,7 @@ namespace details
     };
 
     template<>
-    struct _MarshalHelper<::Platform::String>
+    struct _MarshalHelper< ::Platform::String>
     {
         static ::Platform::String^ _Perform(::Platform::String^& _ObjInCtx, const _ContextCallback& _Ctx)
         {