From 3f0603656bc8831b58dbb32383c2126c8246ce6d Mon Sep 17 00:00:00 2001 From: casey langen Date: Tue, 6 Oct 2020 19:54:18 -0700 Subject: [PATCH] Fixed Linux compile. --- src/core/net/WebSocketClient.cpp | 6 +++--- src/musikcube/stdafx.h | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/core/net/WebSocketClient.cpp b/src/core/net/WebSocketClient.cpp index 40aa49cba..95597bfdc 100644 --- a/src/core/net/WebSocketClient.cpp +++ b/src/core/net/WebSocketClient.cpp @@ -34,7 +34,7 @@ #include "pch.hpp" -#include +#include #include #include #include @@ -49,7 +49,7 @@ using Connection = WebSocketClient::Connection; static const std::string sUri = "ws://127.0.0.1:7905"; -static std::atomic nextMessageId = 0; +static std::atomic nextMessageId(0); static inline std::string generateMessageId() { return "integrated-websocket-client-" + std::to_string(nextMessageId.fetch_add(1)); @@ -238,4 +238,4 @@ void WebSocketClient::SetState(State state) { this->state = state; this->listener->OnClientStateChanged(this, state, oldState); } -} \ No newline at end of file +} diff --git a/src/musikcube/stdafx.h b/src/musikcube/stdafx.h index 4cd699bd5..e2062b10a 100644 --- a/src/musikcube/stdafx.h +++ b/src/musikcube/stdafx.h @@ -34,6 +34,10 @@ #pragma once +/* curses defines a timeout() method that causes issues with +asio's streambuf. include it up front so work around this */ +#include + #include #include #include @@ -85,4 +89,4 @@ #include #include -#include \ No newline at end of file +#include