Skip to content

Commit 53293e4

Browse files
committed
Merge branch 'deeringc-master' into development
2 parents c82795c + d7c9e7c commit 53293e4

File tree

4 files changed

+397
-87
lines changed

4 files changed

+397
-87
lines changed

CONTRIBUTORS.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ Gery Vessere (gery@vessere.com)
3434

3535
Cisco Systems
3636
Gergely Lukacsy (glukacsy)
37+
Chris Deering (deeringc)
3738

3839
Ocedo GmbH
3940
Henning Pfeiffer (megaposer)

Release/include/cpprest/details/web_utilities.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ namespace web
3030
namespace http { namespace client { namespace details {
3131
class winhttp_client;
3232
class winrt_client;
33+
class asio_context;
3334
}}}
3435
namespace websockets { namespace client { namespace details {
3536
class winrt_callback_client;
@@ -124,6 +125,7 @@ class credentials
124125
private:
125126
friend class http::client::details::winhttp_client;
126127
friend class http::client::details::winrt_client;
128+
friend class http::client::details::asio_context;
127129
friend class websockets::client::details::winrt_callback_client;
128130
friend class websockets::client::details::wspp_callback_client;
129131

0 commit comments

Comments
 (0)