diff --git a/conan/profiles/vs32 b/conan/profiles/vs32 index f78b6c43..a053784c 100644 --- a/conan/profiles/vs32 +++ b/conan/profiles/vs32 @@ -3,6 +3,7 @@ include(default) [settings] compiler=msvc compiler.cppstd=17 +winver=0x0600 arch=x86 compiler.runtime=static compiler.runtime_type=Release diff --git a/conan/profiles/vs32debug b/conan/profiles/vs32debug index 44563790..b725433f 100644 --- a/conan/profiles/vs32debug +++ b/conan/profiles/vs32debug @@ -3,6 +3,7 @@ include(default) [settings] compiler=msvc compiler.cppstd=17 +winver=0x0600 arch=x86 compiler.runtime=static compiler.runtime_type=Debug diff --git a/conan/profiles/vs32shared b/conan/profiles/vs32shared index cac3622e..c8f19481 100644 --- a/conan/profiles/vs32shared +++ b/conan/profiles/vs32shared @@ -4,6 +4,7 @@ include(default) compiler=msvc compiler.cppstd=17 arch=x86 +winver=0x0600 compiler.runtime=dynamic compiler.runtime_type=Release build_type=Release diff --git a/conanfile.py b/conanfile.py index 2c384fb3..60916572 100644 --- a/conanfile.py +++ b/conanfile.py @@ -35,7 +35,7 @@ class MTConnectAgentConan(ConanFile): "with_ruby": True, "development": False, "shared": False, - "winver": "0x600", + "winver": "0x602", "with_docs": False, "cpack": False, "agent_prefix": None, @@ -227,6 +227,7 @@ def package_info(self): winver=str(self.options.winver) self.cpp_info.defines.append("WINVER=" + winver) self.cpp_info.defines.append("_WIN32_WINNT=" + winver) + self.cpp_info.defines.append("BOOST_USE_WINAPI_VERSION=" + winver) def package(self): cmake = CMake(self) diff --git a/src/mtconnect/sink/rest_sink/websocket_session.hpp b/src/mtconnect/sink/rest_sink/websocket_session.hpp index c0bd12a2..7a84bfbc 100644 --- a/src/mtconnect/sink/rest_sink/websocket_session.hpp +++ b/src/mtconnect/sink/rest_sink/websocket_session.hpp @@ -100,7 +100,7 @@ namespace mtconnect::sink::rest_sink { void close() override { - //NAMED_SCOPE("PlainWebsocketSession::close"); + NAMED_SCOPE("PlainWebsocketSession::close"); if (!m_isOpen) return; @@ -128,7 +128,7 @@ namespace mtconnect::sink::rest_sink { void writeResponse(ResponsePtr &&response, Complete complete = nullptr) override { - //NAMED_SCOPE("WebsocketSession::writeResponse"); + NAMED_SCOPE("WebsocketSession::writeResponse"); if (!response->m_requestId) { boost::system::error_code ec; @@ -140,7 +140,7 @@ namespace mtconnect::sink::rest_sink { void writeFailureResponse(ResponsePtr &&response, Complete complete = nullptr) override { - //NAMED_SCOPE("WebsocketSession::writeFailureResponse"); + NAMED_SCOPE("WebsocketSession::writeFailureResponse"); writeChunk(response->m_body, complete, response->m_requestId); } @@ -175,7 +175,7 @@ namespace mtconnect::sink::rest_sink { void writeChunk(const std::string &chunk, Complete complete, std::optional requestId = std::nullopt) override { - //NAMED_SCOPE("WebsocketSession::writeChunk"); + NAMED_SCOPE("WebsocketSession::writeChunk"); if (!derived().stream().is_open()) { @@ -219,7 +219,7 @@ namespace mtconnect::sink::rest_sink { void send(const std::string body, Complete complete, const std::string &requestId) { - //NAMED_SCOPE("WebsocketSession::send"); + NAMED_SCOPE("WebsocketSession::send"); using namespace std::placeholders; @@ -255,7 +255,7 @@ namespace mtconnect::sink::rest_sink { void sent(beast::error_code ec, std::size_t len, const std::string &id) { - //NAMED_SCOPE("WebsocketSession::sent"); + NAMED_SCOPE("WebsocketSession::sent"); if (ec) { @@ -310,7 +310,7 @@ namespace mtconnect::sink::rest_sink { void onRead(beast::error_code ec, std::size_t len) { - //NAMED_SCOPE("PlainWebsocketSession::onRead"); + NAMED_SCOPE("PlainWebsocketSession::onRead"); if (ec) return fail(boost::beast::http::status::internal_server_error, "shutdown", ec);