sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-30 06:33:51 +00:00
Code Issues Releases Wiki Activity

Use standard version of make_unique when available (#2292)

Browse Source
This commit is contained in:
Oxan van Leeuwen
2021-09-14 14:27:35 +02:00
committed by GitHub
parent 4cc2817fcd
commit 716039e452
8 changed files with 35 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
esphome/components/nfc/ndef_message.cpp
View File

@@ -83,11 +83,11 @@ bool NdefMessage::add_text_record(const std::string &text) { return this->add_te
bool NdefMessage::add_text_record(const std::string &text, const std::string &encoding) {
std::string payload = to_string(text.length()) + encoding + text;
return this->add_record(std::unique_ptr<NdefRecord>{new NdefRecord(TNF_WELL_KNOWN, "T", payload)});
return this->add_record(make_unique<NdefRecord>(TNF_WELL_KNOWN, "T", payload));
}
bool NdefMessage::add_uri_record(const std::string &uri) {
return this->add_record(std::unique_ptr<NdefRecord>{new NdefRecord(TNF_WELL_KNOWN, "U", uri)});
return this->add_record(make_unique<NdefRecord>(TNF_WELL_KNOWN, "U", uri));
}
std::vector<uint8_t> NdefMessage::encode() {

4
esphome/components/nfc/nfc_tag.h
View File

@@ -31,13 +31,13 @@ class NfcTag {
NfcTag(std::vector<uint8_t> &uid, const std::string &tag_type, std::vector<uint8_t> &ndef_data) {
this->uid_ = uid;
this->tag_type_ = tag_type;
this->ndef_message_ = std::unique_ptr<NdefMessage>(new NdefMessage(ndef_data));
this->ndef_message_ = make_unique<NdefMessage>(ndef_data);
};
NfcTag(const NfcTag &rhs) {
uid_ = rhs.uid_;
tag_type_ = rhs.tag_type_;
if (rhs.ndef_message_ != nullptr)
ndef_message_ = std::unique_ptr<NdefMessage>(new NdefMessage(*rhs.ndef_message_));
ndef_message_ = make_unique<NdefMessage>(*rhs.ndef_message_);
}
std::vector<uint8_t> &get_uid() { return this->uid_; };