Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
hfedcba committed Jan 8, 2017
2 parents 61b60a0 + 1095430 commit ec90082
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/MyCentral.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class MyCentral : public BaseLib::Systems::ICentral
std::string handleCliCommand(std::string command);
virtual bool onPacketReceived(std::string& senderID, std::shared_ptr<BaseLib::Systems::Packet> packet) { return true; }

uint64_t getPeerIdFromSerial(std::string serialNumber) { std::shared_ptr<MyPeer> peer = getPeer(serialNumber); if(peer) return peer->getID(); else return 0; }
uint64_t getPeerIdFromSerial(std::string& serialNumber) { std::shared_ptr<MyPeer> peer = getPeer(serialNumber); if(peer) return peer->getID(); else return 0; }
std::shared_ptr<MyPeer> getPeer(uint64_t id);
std::shared_ptr<MyPeer> getPeer(std::string serialNumber);

Expand Down

0 comments on commit ec90082

Please sign in to comment.