From 056b02a4942d6c5ba09395bb48af294a83c174c7 Mon Sep 17 00:00:00 2001 From: Benjamin Sergeant Date: Fri, 19 Mar 2021 11:25:48 -0700 Subject: [PATCH] ws: WebSocketSender uses anonymous namespace load instead of its own method --- ws/ws.cpp | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/ws/ws.cpp b/ws/ws.cpp index 34e56d44..57c846c5 100644 --- a/ws/ws.cpp +++ b/ws/ws.cpp @@ -2075,23 +2075,6 @@ namespace ix _condition.wait(lock); } - std::vector load(const std::string& path) - { - std::vector memblock; - - std::ifstream file(path); - if (!file.is_open()) return memblock; - - file.seekg(0, file.end); - std::streamoff size = file.tellg(); - file.seekg(0, file.beg); - - memblock.resize((size_t) size); - file.read((char*) &memblock.front(), static_cast(size)); - - return memblock; - } - void WebSocketSender::start() { _webSocket.setUrl(_url); @@ -2185,7 +2168,8 @@ namespace ix std::vector content; { Bench bench("ws_send: load file from disk"); - content = load(filename); + auto res = load(filename); + content = res.second; } _id = uuid4();