From 471638c60e1c99329eadbc4e680f946a11f13daf Mon Sep 17 00:00:00 2001 From: Gyorgy Szekely Date: Tue, 3 Oct 2017 12:00:15 +0200 Subject: [PATCH] Fix enum and non-enum in conditional exp. warning --- CHANGELOG.md | 1 + include/boost/beast/websocket/impl/read.ipp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f0c58e4..92ef6f39 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ Version 121: * Add test for issue 802 +* Fix enum and non-enum in conditional exp. warning -------------------------------------------------------------------------------- diff --git a/include/boost/beast/websocket/impl/read.ipp b/include/boost/beast/websocket/impl/read.ipp index 8663a9d2..c643e32a 100644 --- a/include/boost/beast/websocket/impl/read.ipp +++ b/include/boost/beast/websocket/impl/read.ipp @@ -1075,7 +1075,8 @@ loop: // _Start the WebSocket Closing Handshake_ do_fail( cr.code == close_code::none ? - close_code::normal : cr.code, + close_code::normal : + static_cast(cr.code), error::closed, ec); return bytes_written; }