mirror of
https://codeberg.org/comaps/comaps
synced 2026-01-06 04:24:29 +00:00
Fix unity build error by removing using namespace std;
Signed-off-by: Alexander Borsuk <me@alex.bio>
This commit is contained in:
committed by
Konstantin Pastbin
parent
b5b333c832
commit
215c19dcc7
@@ -5,9 +5,6 @@
|
||||
#include <algorithm>
|
||||
#include <chrono>
|
||||
|
||||
using namespace std;
|
||||
using namespace std::chrono;
|
||||
|
||||
namespace platform
|
||||
{
|
||||
namespace tests_support
|
||||
@@ -17,7 +14,7 @@ TestSocket::~TestSocket()
|
||||
m_isConnected = false;
|
||||
}
|
||||
|
||||
bool TestSocket::Open(string const & host, uint16_t port)
|
||||
bool TestSocket::Open(std::string const & host, uint16_t port)
|
||||
{
|
||||
if (m_isConnected)
|
||||
return false;
|
||||
@@ -36,13 +33,13 @@ bool TestSocket::Read(uint8_t * data, uint32_t count)
|
||||
if (!m_isConnected)
|
||||
return false;
|
||||
|
||||
unique_lock<mutex> lock(m_inputMutex);
|
||||
std::unique_lock<std::mutex> lock(m_inputMutex);
|
||||
|
||||
m_inputCondition.wait_for(lock, milliseconds(m_timeoutMs), [this]() { return !m_input.empty(); });
|
||||
m_inputCondition.wait_for(lock, std::chrono::milliseconds(m_timeoutMs), [this]() { return !m_input.empty(); });
|
||||
if (m_input.size() < count)
|
||||
return false;
|
||||
|
||||
copy(m_input.begin(), m_input.end(), data);
|
||||
std::copy(m_input.begin(), m_input.end(), data);
|
||||
m_input.erase(m_input.begin(), m_input.begin() + count);
|
||||
return true;
|
||||
}
|
||||
@@ -53,7 +50,7 @@ bool TestSocket::Write(uint8_t const * data, uint32_t count)
|
||||
return false;
|
||||
|
||||
{
|
||||
lock_guard<mutex> lg(m_outputMutex);
|
||||
std::lock_guard lg(m_outputMutex);
|
||||
m_output.insert(m_output.end(), data, data + count);
|
||||
}
|
||||
m_outputCondition.notify_one();
|
||||
@@ -64,10 +61,10 @@ void TestSocket::SetTimeout(uint32_t milliseconds)
|
||||
{
|
||||
m_timeoutMs = milliseconds;
|
||||
}
|
||||
size_t TestSocket::ReadServer(vector<uint8_t> & destination)
|
||||
size_t TestSocket::ReadServer(std::vector<uint8_t> & destination)
|
||||
{
|
||||
unique_lock<mutex> lock(m_outputMutex);
|
||||
m_outputCondition.wait_for(lock, milliseconds(m_timeoutMs), [this]() { return !m_output.empty(); });
|
||||
std::unique_lock lock(m_outputMutex);
|
||||
m_outputCondition.wait_for(lock, std::chrono::milliseconds(m_timeoutMs), [this]() { return !m_output.empty(); });
|
||||
|
||||
size_t const outputSize = m_output.size();
|
||||
destination.insert(destination.end(), m_output.begin(), m_output.end());
|
||||
|
||||
Reference in New Issue
Block a user