Merge branch 'development' of https://git01.codeplex.com/casablanca into uap_support

Author: stgates

Release/samples/CasaLens/casalens.cpp

@@ -81,12 +81,12 @@ void CasaLens::handle_error(pplx::task<void>& t)
 
 pplx::task<void> CasaLens::open()
 {
-    return m_listener.open().then(std::bind(&handle_error, std::placeholders::_1));
+	return m_listener.open().then([](pplx::task<void> t) { handle_error(t); });
 }
 
 pplx::task<void> CasaLens::close()
 {
-    return m_listener.close().then(std::bind(&handle_error, std::placeholders::_1));
+    return m_listener.close().then([](pplx::task<void> t) { handle_error(t); });
 }
 
 // Handler to process HTTP::GET requests.
@@ -97,15 +97,15 @@ void CasaLens::handle_get(http_request message)
     auto content_data = m_htmlcontentmap.find(path);
     if (content_data == m_htmlcontentmap.end())
     {
-        message.reply(status_codes::NotFound, U("Path not found")).then(std::bind(&handle_error, std::placeholders::_1));
+        message.reply(status_codes::NotFound, U("Path not found")).then([](pplx::task<void> t) { handle_error(t); });
         return;
     }
 
     auto file_name = std::get<0>(content_data->second);
     auto content_type = std::get<1>(content_data->second);
     concurrency::streams::fstream::open_istream(file_name, std::ios::in).then([=](concurrency::streams::istream is)
     {
-        message.reply(status_codes::OK, is, content_type).then(std::bind(&handle_error, std::placeholders::_1));
+        message.reply(status_codes::OK, is, content_type).then([](pplx::task<void> t) { handle_error(t); });
     }).then([=](pplx::task<void>& t)
     {
         try
@@ -116,7 +116,7 @@ void CasaLens::handle_get(http_request message)
         {
             // opening the file (open_istream) failed.
             // Reply with an error.
-            message.reply(status_codes::InternalError).then(std::bind(&handle_error, std::placeholders::_1));
+            message.reply(status_codes::InternalError).then([](pplx::task<void> t) { handle_error(t); });
         }
     });
 }
@@ -132,11 +132,11 @@ void CasaLens::handle_post(http_request message)
         message.extract_string().then([=](const utility::string_t& location)
         {
             get_data(message, location); 
-        }).then(std::bind(&handle_error, std::placeholders::_1));
+        }).then([](pplx::task<void> t) { handle_error(t); });
     }
     else
     {
-        message.reply(status_codes::NotFound, U("Path not found")).then(std::bind(&handle_error, std::placeholders::_1));
+        message.reply(status_codes::NotFound, U("Path not found")).then([](pplx::task<void> t) { handle_error(t); });
     }
 }
 

Release/samples/CasaLens/datafetcher.cpp

@@ -395,11 +395,11 @@ void CasaLens::fetch_data(http_request message, const std::wstring& postal_code,
         }
 
         // Reply with the aggregated JSON data
-        message.reply(status_codes::OK, resp_data).then(std::bind(&handle_error, std::placeholders::_1));
+        message.reply(status_codes::OK, resp_data).then([](pplx::task<void> t) { handle_error(t); });
     }
     catch(...)
     {
-        message.reply(status_codes::InternalError).then(std::bind(&handle_error, std::placeholders::_1));
+        message.reply(status_codes::InternalError).then([](pplx::task<void> t) { handle_error(t); });
     }
 }