[Libreoffice-commits] online.git: Branch 'libreoffice-5-4' - net/WebSocketHandler.hpp

[Tor Lillqvist]

 net/WebSocketHandler.hpp |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 400b29fb800fd62f8976b470fe01adbc2cbacf89
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Oct 26 11:38:43 2017 +0300

    Avoid warning "this statement may fall through" when intentional
    
    Change-Id: I8d8bcb4747a1933e4ecefe1220a80a355e60317f
    (cherry picked from commit 6b0faf9d97d9c479f3297ccfc0bf1b06d1de0e34)
    Reviewed-on: https://gerrit.libreoffice.org/48624
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/net/WebSocketHandler.hpp b/net/WebSocketHandler.hpp
index 4ff01c36..8ff0fff2 100644
--- a/net/WebSocketHandler.hpp
+++ b/net/WebSocketHandler.hpp
@@ -213,6 +213,11 @@ public:
         case WSOpCode::Ping:
             LOG_ERR("#" << socket->getFD() << ": Clients should not send pings, only servers");
             // drop through
+#if defined __clang__
+            [[clang::fallthrough]];
+#elif defined __GNUC__ && __GNUC__ >= 7
+            [[fallthrough]];
+#endif
         case WSOpCode::Close:
             if (!_shuttingDown)
             {