From 197b6e85bd1c8cb590ee26001e68d128b7dd9e9e Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Tue, 14 Aug 2018 16:44:29 -0400 Subject: [PATCH 1/3] Quiet websocketpp.transport errors --- src/server/sparkd/http/WebServer.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/server/sparkd/http/WebServer.cpp b/src/server/sparkd/http/WebServer.cpp index b4d9d3ec1..5343d3d31 100644 --- a/src/server/sparkd/http/WebServer.cpp +++ b/src/server/sparkd/http/WebServer.cpp @@ -77,6 +77,7 @@ namespace http { _server.set_http_handler(bind(&ServerState::on_http, this, ::_1)); // Turn off logging _server.clear_access_channels(websocketpp::log::alevel::all); + _server.clear_error_channels(websocketpp::log::alevel::all); run(); } From 289f9259bba108fdd7d9d79fd4bab1d6062bd2ff Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Tue, 14 Aug 2018 15:58:03 -0500 Subject: [PATCH 2/3] I think this will come in handy one day for testing --- src/client/spark/view/Extensions/RandomExtensions.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/client/spark/view/Extensions/RandomExtensions.cs b/src/client/spark/view/Extensions/RandomExtensions.cs index 189c1a217..a6176537f 100644 --- a/src/client/spark/view/Extensions/RandomExtensions.cs +++ b/src/client/spark/view/Extensions/RandomExtensions.cs @@ -14,6 +14,9 @@ namespace mbts.ui { return random.NextDouble() * (maxValue - minValue) + minValue; } + public static bool NextBool(this Random random, int truePercentage = 50) { + return random.NextDouble() < (truePercentage / 100.0); + } } From 7db6591d22104d2dfdac60b0029db71f2a56b2e2 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Wed, 15 Aug 2018 11:25:28 -0400 Subject: [PATCH 3/3] fix _DISABLE_EXTENDED_ALIGNED_STORAGE issue with 15.8.0 msvc compiler --- src/lib/md/test/Co2TestInstrument.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/lib/md/test/Co2TestInstrument.cpp b/src/lib/md/test/Co2TestInstrument.cpp index 4b6cd929c..06d037b1c 100644 --- a/src/lib/md/test/Co2TestInstrument.cpp +++ b/src/lib/md/test/Co2TestInstrument.cpp @@ -1,4 +1,4 @@ -#ifndef NO_CPP0X +#define _DISABLE_EXTENDED_ALIGNED_STORAGE #include "Co2TestInstrument.h" #include "lib/md/MemorySegmentUtils.h" @@ -50,4 +50,3 @@ MDConsumerHandle Co2TestInstrument::consumer() { Co2TestInstrument::~Co2TestInstrument() { } }}//namespace -#endif