wsd/LOOLWebSocket.hpp | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-)
New commits: commit ad044e601f0beef24f1ed37b92effeb366666461 Author: Pranav Kant <pran...@collabora.co.uk> Date: Sun Dec 18 00:21:09 2016 +0530 Bin 'setting minimum socket buffer' in non-debug mode for tests Initial effort was setting it when we are compiling with --enable-debug or when not, unit tests are running, but since we don't run the unit tests in absence of --enable-debug anyways, there is no use for this #else code block. Change-Id: I9d7c66a18be160a47afd2bf336d89d50d4f2463e (cherry picked from commit 8d3c60c9a853312bf8a8809db2bc2bb29f604782) Reviewed-on: https://gerrit.libreoffice.org/32129 Reviewed-by: Michael Meeks <michael.me...@collabora.com> Tested-by: Michael Meeks <michael.me...@collabora.com> diff --git a/wsd/LOOLWebSocket.hpp b/wsd/LOOLWebSocket.hpp index 64aa9f5..4174591 100644 --- a/wsd/LOOLWebSocket.hpp +++ b/wsd/LOOLWebSocket.hpp @@ -49,7 +49,6 @@ private: return std::chrono::milliseconds(baseDelay + (jitter > 0 ? (std::rand() % jitter) : 0)); } -#endif void setMinSocketBufferSize() { @@ -57,6 +56,7 @@ private: setSendBufferSize(0); LOG_INF("Send buffer size for web socket set to minimum: " << getSendBufferSize()); } +#endif public: LOOLWebSocket(const Socket& socket) : @@ -70,11 +70,6 @@ public: { #if ENABLE_DEBUG setMinSocketBufferSize(); -#else - if (UnitWSD::isUnitTesting()) - { - setMinSocketBufferSize(); - } #endif } @@ -85,11 +80,6 @@ public: { #if ENABLE_DEBUG setMinSocketBufferSize(); -#else - if (UnitWSD::isUnitTesting()) - { - setMinSocketBufferSize(); - } #endif } @@ -101,11 +91,6 @@ public: { #if ENABLE_DEBUG setMinSocketBufferSize(); -#else - if (UnitWSD::isUnitTesting()) - { - setMinSocketBufferSize(); - } #endif } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits