3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-04-29 18:27:12 +02:00
Code Issues Projects Releases Packages Wiki Activity

moved std namespace into implementation

Browse source
This commit is contained in:
badaix 2015-08-08 18:51:48 +02:00
parent e45eb08be6
commit e2362a2750
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
server/controlServer.cpp
View file

@ -24,6 +24,8 @@
#include "common/log.h" #include "common/log.h"
#include <iostream> #include <iostream>
using namespace std;
ControlServer::ControlServer(const ControlServerSettings& controlServerSettings) : settings_(controlServerSettings), sampleFormat_(controlServerSettings.sampleFormat) ControlServer::ControlServer(const ControlServerSettings& controlServerSettings) : settings_(controlServerSettings), sampleFormat_(controlServerSettings.sampleFormat)
{ {

9
server/controlServer.h
View file

@ -38,7 +38,6 @@
using boost::asio::ip::tcp; using boost::asio::ip::tcp;
typedef std::shared_ptr<tcp::socket> socket_ptr; typedef std::shared_ptr<tcp::socket> socket_ptr;
using namespace std;
struct ControlServerSettings struct ControlServerSettings
@ -69,15 +68,15 @@ private:
void acceptor(); void acceptor();
mutable std::mutex mutex_; mutable std::mutex mutex_;
PipeReader* pipeReader_; PipeReader* pipeReader_;
set<shared_ptr<ServerSession>> sessions_; std::set<std::shared_ptr<ServerSession>> sessions_;
boost::asio::io_service io_service_; boost::asio::io_service io_service_;
shared_ptr<tcp::acceptor> acceptor_; std::shared_ptr<tcp::acceptor> acceptor_;
ControlServerSettings settings_; ControlServerSettings settings_;
msg::SampleFormat sampleFormat_; msg::SampleFormat sampleFormat_;
msg::ServerSettings serverSettings_; msg::ServerSettings serverSettings_;
thread acceptThread_; std::thread acceptThread_;
Queue<shared_ptr<msg::BaseMessage>> messages_; Queue<std::shared_ptr<msg::BaseMessage>> messages_;
}; };