Skip to content

Commit c86258a

Browse files
author
unknown
committed
Fix build errors on windows and osx
1 parent 36eaee7 commit c86258a

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

Release/include/cpprest/http_client.h

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,14 @@ typedef void* native_handle;}}}
4343
#include <memory>
4444
#include <limits>
4545
#if !defined(_WIN32) && !defined(__cplusplus_winrt)
46-
#include <boost/asio/ssl.hpp>
46+
#if defined(__clang__)
47+
#pragma clang diagnostic push
48+
#pragma clang diagnostic ignored "-Wconversion"
49+
#endif
50+
#include "boost/asio/ssl.hpp"
51+
#if defined(__clang__)
52+
#pragma clang diagnostic pop
53+
#endif
4754
#endif
4855

4956
#include "pplx/pplxtasks.h"

Release/include/cpprest/http_listener.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include <limits>
3030
#include <functional>
3131

32-
#if !defined(_WIN32) || (_WIN32_WINNT >= _WIN32_WINNT_VISTA && !defined(__cplusplus_winrt))
32+
#if !defined(_WIN32) && !defined(__cplusplus_winrt)
3333
#include <boost/asio/ssl.hpp>
3434
#endif
3535

0 commit comments

Comments
 (0)