tests modified accordingly to unique_ptrs
This commit is contained in:
@@ -34,7 +34,7 @@ MqttClient::MqttClient(MqttBroker* local_broker, TcpClient* new_client)
|
||||
// client->onConnect() TODO
|
||||
// client->onDisconnect() TODO
|
||||
#else
|
||||
tcp_client = std::unique_ptr<WiFiClient>(new WiFiClient(*new_client));
|
||||
tcp_client.reset(new WiFiClient(*new_client));
|
||||
#endif
|
||||
alive = millis()+5000;
|
||||
}
|
||||
@@ -89,7 +89,7 @@ void MqttClient::connect(std::string broker, uint16_t port, uint16_t ka)
|
||||
debug("MqttClient::connect_to_host " << broker << ':' << port);
|
||||
keep_alive = ka;
|
||||
close();
|
||||
tcp_client = std::unique_ptr<TcpClient>(new TcpClient);
|
||||
tcp_client.reset(new TcpClient);
|
||||
|
||||
#ifdef TINY_MQTT_ASYNC
|
||||
tcp_client->onData(onData, this);
|
||||
|
||||
@@ -327,7 +327,6 @@ class MqttBroker
|
||||
void connect(const std::string& host, uint16_t port=1883);
|
||||
bool connected() const { return state == Connected; }
|
||||
|
||||
size_t clientsCount() const { return clients.size(); }
|
||||
|
||||
void dump(std::string indent="")
|
||||
{
|
||||
@@ -336,7 +335,13 @@ class MqttBroker
|
||||
}
|
||||
|
||||
using Clients = std::set<std::unique_ptr<MqttClient>>;
|
||||
using LocalClients = std::set<MqttClient*>;
|
||||
|
||||
const Clients& getClients() const { return clients; }
|
||||
const LocalClients& getLocalClients() const { return local_clients; }
|
||||
|
||||
size_t clientsCount() const { return clients.size(); }
|
||||
size_t localClientsCount() const { return local_clients.size(); }
|
||||
|
||||
private:
|
||||
friend class MqttClient;
|
||||
@@ -360,7 +365,7 @@ class MqttBroker
|
||||
|
||||
bool compareString(const char* good, const char* str, uint8_t str_len) const;
|
||||
Clients clients;
|
||||
std::set<MqttClient*> local_clients;
|
||||
LocalClients local_clients;
|
||||
|
||||
private:
|
||||
std::unique_ptr<TcpServer> server;
|
||||
|
||||
Reference in New Issue
Block a user