diff --git a/tools/picture/appl/main.cpp b/tools/picture/appl/main.cpp index 300f8a3..dbae978 100644 --- a/tools/picture/appl/main.cpp +++ b/tools/picture/appl/main.cpp @@ -336,7 +336,6 @@ namespace appl { APPL_WARNING("delete PictureService ..."); } public: - std::vector getAlbums() { return m_user->getAlbums(); } diff --git a/tools/system-gateway/appl/ClientInterface.cpp b/tools/system-gateway/appl/ClientInterface.cpp index 24b0d48..1d9ca9d 100644 --- a/tools/system-gateway/appl/ClientInterface.cpp +++ b/tools/system-gateway/appl/ClientInterface.cpp @@ -109,7 +109,7 @@ void appl::ClientInterface::onClientData(const ememory::SharedPtr& answerProtocolError(transactionId, "missing parameter: 'call' / wrong type 'call'"); return; } - ememory::SharedPtr callObj = std::static_pointer_cast(_value); + ememory::SharedPtr callObj = ememory::staticPointerCast(_value); std::string callFunction = callObj->getCall(); switch (m_state) { case appl::ClientInterface::state::disconnect: diff --git a/tools/system-gateway/appl/GateWay.cpp b/tools/system-gateway/appl/GateWay.cpp index 1ecfd85..5969554 100644 --- a/tools/system-gateway/appl/GateWay.cpp +++ b/tools/system-gateway/appl/GateWay.cpp @@ -67,14 +67,14 @@ namespace appl { void appl::GateWay::newService(enet::Tcp _connection) { ZEUS_WARNING("New TCP connection (service)"); - ememory::SharedPtr tmp = std::make_shared(std::move(_connection), this); + ememory::SharedPtr tmp = ememory::makeShared(std::move(_connection), this); tmp->start(); m_serviceList.push_back(tmp); } void appl::GateWay::newClient(enet::Tcp _connection) { ZEUS_WARNING("New TCP connection (client)"); - ememory::SharedPtr tmp = std::make_shared(std::move(_connection), this); + ememory::SharedPtr tmp = ememory::makeShared(std::move(_connection), this); tmp->start(m_clientUID++, m_clientUID++); m_clientList.push_back(tmp); } @@ -87,8 +87,8 @@ appl::GateWay::GateWay() : propertyServiceIp(this, "service-ip", "127.0.0.1", "Ip to listen client", &appl::GateWay::onPropertyChangeServiceIp), propertyServicePort(this, "service-port", 1982, "Port to listen client", &appl::GateWay::onPropertyChangeServicePort), propertyServiceMax(this, "service-max", 80, "Maximum of client at the same time", &appl::GateWay::onPropertyChangeServiceMax) { - m_interfaceClientServer = std::make_shared(this, false); - m_interfaceServiceServer = std::make_shared(this, true); + m_interfaceClientServer = ememory::makeShared(this, false); + m_interfaceServiceServer = ememory::makeShared(this, true); } appl::GateWay::~GateWay() { diff --git a/tools/system-gateway/appl/ServiceInterface.cpp b/tools/system-gateway/appl/ServiceInterface.cpp index 4c21a63..6bebeb9 100644 --- a/tools/system-gateway/appl/ServiceInterface.cpp +++ b/tools/system-gateway/appl/ServiceInterface.cpp @@ -75,7 +75,7 @@ void appl::ServiceInterface::onServiceData(const ememory::SharedPtrgetType() == zeus::Buffer::typeMessage::call) { - ememory::SharedPtr callObj = std::static_pointer_cast(_value); + ememory::SharedPtr callObj = ememory::staticPointerCast(_value); std::string callFunction = callObj->getCall(); if (callFunction == "connect-service") { if (m_name != "") { diff --git a/zeus/Buffer.cpp b/zeus/Buffer.cpp index 017e399..1d314f8 100644 --- a/zeus/Buffer.cpp +++ b/zeus/Buffer.cpp @@ -74,7 +74,7 @@ void zeus::Buffer::appendBuffer(const ememory::SharedPtr& _obj) { return; } setPartFinish(_obj->getPartFinish()); - appendBufferData(std::static_pointer_cast(_obj)); + appendBufferData(ememory::staticPointerCast(_obj)); } bool zeus::Buffer::writeOn(enet::WebSocket& _interface) { diff --git a/zeus/Client.cpp b/zeus/Client.cpp index 01a0ee0..9380afd 100644 --- a/zeus/Client.cpp +++ b/zeus/Client.cpp @@ -44,7 +44,7 @@ bool zeus::Client::connectTo(const std::string& _address) { ZEUS_DEBUG("connect [START]"); disconnect(); enet::Tcp connection = std::move(enet::connectTcpClient(*propertyIp, *propertyPort)); - m_interfaceClient = std::make_shared(); + m_interfaceClient = ememory::makeShared(); if (m_interfaceClient == nullptr) { ZEUS_ERROR("Allocate connection error"); return false; diff --git a/zeus/FutureBase.cpp b/zeus/FutureBase.cpp index 8a31d50..cc17913 100644 --- a/zeus/FutureBase.cpp +++ b/zeus/FutureBase.cpp @@ -18,7 +18,7 @@ zeus::FutureBase::FutureBase() { } zeus::FutureBase::FutureBase(uint32_t _transactionId, zeus::FutureData::ObserverFinish _callback, uint32_t _clientId) { - m_data = std::make_shared(); + m_data = ememory::makeShared(); if (m_data == nullptr) { return; } @@ -37,7 +37,7 @@ ememory::SharedPtr zeus::FutureBase::getRaw() { } zeus::FutureBase::FutureBase(uint32_t _transactionId, const ememory::SharedPtr& _returnData, zeus::FutureData::ObserverFinish _callback, uint32_t _clientId) { - m_data = std::make_shared(); + m_data = ememory::makeShared(); if (m_data == nullptr) { return; } diff --git a/zeus/Service.cpp b/zeus/Service.cpp index fa4311c..40aa991 100644 --- a/zeus/Service.cpp +++ b/zeus/Service.cpp @@ -85,7 +85,7 @@ void zeus::Service::connect(const std::string& _serviceName, uint32_t _numberRet ZEUS_DEBUG("connect [STOP] ==> can not connect"); return; } - m_interfaceClient = std::make_shared(); + m_interfaceClient = ememory::makeShared(); if (m_interfaceClient == nullptr) { ZEUS_ERROR("Can not allocate interface ..."); return; @@ -141,7 +141,7 @@ void zeus::Service::callBinary(const ememory::SharedPtr& _obj) { return; } if (_obj->getType() == zeus::Buffer::typeMessage::call) { - ememory::SharedPtr callObj = std::static_pointer_cast(_obj); + ememory::SharedPtr callObj = ememory::staticPointerCast(_obj); uint32_t clientId = callObj->getClientId(); std::string callFunction = callObj->getCall(); if (callFunction[0] == '_') { diff --git a/zeus/Service.h b/zeus/Service.h index f36053c..4ed6435 100644 --- a/zeus/Service.h +++ b/zeus/Service.h @@ -301,8 +301,8 @@ namespace zeus { ZEUS_DEBUG("connect: " << _clientId << " to '" << _userName << "'"); ZEUS_DEBUG(" client name='" << _clientName << "'"); ZEUS_DEBUG(" groups=" << etk::to_string(_groups)); - ememory::SharedPtr tmpProperty = std::make_shared(_clientName, _groups); - ememory::SharedPtr tmpSrv = std::make_shared(m_getUserInterface.getUser(_userName), tmpProperty); + ememory::SharedPtr tmpProperty = ememory::makeShared(_clientName, _groups); + ememory::SharedPtr tmpSrv = ememory::makeShared(m_getUserInterface.getUser(_userName), tmpProperty); m_interface.insert(std::make_pair(_clientId, std::make_pair(tmpProperty, tmpSrv))); // enable list of function availlable: for (auto &it : m_listFunction) { diff --git a/zeus/WebServer.h b/zeus/WebServer.h index 746c18c..cf9b4da 100644 --- a/zeus/WebServer.h +++ b/zeus/WebServer.h @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include