Skip to content

Commit 2aff296

Browse files
committed
Added workaround for broken c++11 support in boost on libstdc++/clang/android
1 parent 543e8eb commit 2aff296

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

Release/tests/functional/websockets/utilities/test_websocket_server.cpp

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
#define _WEBSOCKETPP_CONSTEXPR_TOKEN_
4141
#else
4242
#define _WEBSOCKETPP_NULLPTR_TOKEN_ 0
43-
#endif
44-
#endif
43+
#endif /* _MSC_VER >= 1800 */
44+
#endif /* _WIN32 */
4545

4646
#if defined(__APPLE__)
4747
#include "stdlib.h"
@@ -51,6 +51,11 @@
5151
#undef ntohll
5252
#undef htonll
5353
#endif
54+
55+
#if defined(__clang__) && defined(ANDROID)
56+
#define _WEBSOCKETPP_NULLPTR_TOKEN_ 0
57+
#endif
58+
5459
#include <websocketpp/config/asio_no_tls.hpp>
5560
#include <websocketpp/server.hpp>
5661
#if defined(__APPLE__)

0 commit comments

Comments
 (0)