kevin
/
WiFlasher
1
0
Fork 0
Code Pull Requests Releases Activity

remove alias from std namespace

This commit is contained in:
Kevin Matz 2021-01-26 16:21:56 -05:00
parent eeaffcf0c9
commit deb3b9f3a7
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libESTA/sacn/receiver.cpp
View File

@ -101,7 +101,7 @@ Receive VECTOR_ROOT_E131_DATA vector'd packets.
@param pdu is a shared pointer to the PDU
*/
void Receiver::rootDataHandler(shared_ptr<RLP::Pdu> root) {
void Receiver::rootDataHandler(std::shared_ptr<RLP::Pdu> root) {
auto block = PDU::readBlock<DATA::Pdu>(root->buffer(), root);
if (root->buffer()->fail())
return;
@ -128,7 +128,7 @@ Merging will be based on frame header. PDU data will be read as a block of DMP
@param pdu is a shared pointer to the PDU
*/
void Receiver::dataPacketHandler(shared_ptr<DATA::Pdu> frame) {
void Receiver::dataPacketHandler(std::shared_ptr<DATA::Pdu> frame) {
// header may be inherited. check that one exists
if (!frame->header())
return;

4
libESTA/sacn/receiver.h
View File

@ -41,8 +41,8 @@ public:
protected:
void packetHandler(PDU::Stream);
void rootDataHandler(shared_ptr<RLP::Pdu>);
void dataPacketHandler(shared_ptr<DATA::Pdu>);
void rootDataHandler(std::shared_ptr<RLP::Pdu>);
void dataPacketHandler(std::shared_ptr<DATA::Pdu>);
private:
std::unordered_map <uint16_t, SACN::Universe *> universes_;

2
libESTA/sacn/universe.cpp
View File

@ -32,7 +32,7 @@ Universe::Universe()
synchronized_ = false;
}
void Universe::set(shared_ptr<DMP::Pdu> dmp) {
void Universe::set(std::shared_ptr<DMP::Pdu> dmp) {
// 7.3 Address Type and Data Type
// Sources shall set the DMP Layer's Address Type and Data Type to 0xa1.
// Receivers shall discard the packet if the received value is not 0xa1.

6
libESTA/sacn/universe.h
View File

@ -28,8 +28,10 @@
#include <memory>
namespace SACN {
using std::shared_ptr;
/**
universe data
*/
class Universe
: public DMX::Universe
{
@ -37,7 +39,7 @@ public:
Universe();
bool isSyncronized() const {return synchronized_;};
void set(shared_ptr<DMP::Pdu>);
void set(std::shared_ptr<DMP::Pdu>);
private:
bool synchronized_;