cleanup: fixup 18b9df3

Author: facchinm

libraries/WiFiS3/src/Modem.cpp

@@ -4,6 +4,8 @@
 #define RESULT_ERROR "ERROR\r\n"
 #define RESULT_DATA "DATA\r\n"
 
+using namespace std;
+
 /* -------------------------------------------------------------------------- */
 ModemClass::ModemClass(int tx, int rx) : beginned(false), delete_serial(false), _timeout(MODEM_TIMEOUT), trim_results(true), read_by_size(false) {
 /* -------------------------------------------------------------------------- */

libraries/WiFiS3/src/Modem.h

@@ -23,8 +23,8 @@ class ModemClass {
 
   void begin(int badurate = 115200);
   void end();
-  bool write(const string &cmd, string &str, char * fmt, ...);
-  void write_nowait(const string &cmd, string &str, char * fmt, ...);
+  bool write(const std::string &cmd, std::string &str, char * fmt, ...);
+  void write_nowait(const std::string &cmd, std::string &str, char * fmt, ...);
 
   bool passthrough(const uint8_t *data, size_t size);
   void avoid_trim_results() {
@@ -44,14 +44,14 @@ class ModemClass {
   #endif
 
 private:
-  bool buf_read(const string &cmd, string &data_res);
+  bool buf_read(const std::string &cmd, std::string &data_res);
   bool delete_serial;
   UART * _serial;
   unsigned long _timeout;
   uint8_t tx_buff[MAX_BUFF_SIZE];
   bool trim_results;
   bool read_by_size;
-  bool read_by_size_finished(string &rx);
+  bool read_by_size_finished(std::string &rx);
 };
 
 extern ModemClass modem;

libraries/WiFiS3/src/WiFi.cpp

@@ -1,5 +1,6 @@
 #include "WiFi.h"
 
+using namespace std;
 
 /* -------------------------------------------------------------------------- */
 CWifi::CWifi() : _timeout(50000){

libraries/WiFiS3/src/WiFi.h

@@ -18,12 +18,12 @@
 
 class CAccessPoint {
    public:
-      string ssid;
-      string bssid;
+      std::string ssid;
+      std::string bssid;
       uint8_t uint_bssid[6];
-      string rssi;
-      string channel;
-      string encryption_mode;
+      std::string rssi;
+      std::string channel;
+      std::string encryption_mode;
 };
 
 
@@ -34,7 +34,7 @@ class CWifi {
    void _config(IPAddress local_ip, IPAddress gateway, IPAddress subnet, IPAddress dns1, IPAddress dns2);
    unsigned long _timeout;
    uint8_t mac[6];
-   vector<CAccessPoint> access_points;
+   std::vector<CAccessPoint> access_points;
 
 
    IPAddress ip_ap = DEFAULT_IP_AP_ADDRESS;

libraries/WiFiS3/src/WiFiClient.cpp

@@ -1,14 +1,16 @@
 #include "WiFiClient.h"
 
+using namespace std;
+
 /* -------------------------------------------------------------------------- */
 WiFiClient::WiFiClient() : _sock(-1), destroy_at_distructor(true), rx_buffer(nullptr) { 
-   rx_buffer = shared_ptr<FifoBuffer<uint8_t,RX_BUFFER_DIM>>(new FifoBuffer<uint8_t,RX_BUFFER_DIM>());
+   rx_buffer = std::shared_ptr<FifoBuffer<uint8_t,RX_BUFFER_DIM>>(new FifoBuffer<uint8_t,RX_BUFFER_DIM>());
 }
 /* -------------------------------------------------------------------------- */
 
 /* -------------------------------------------------------------------------- */
 WiFiClient::WiFiClient(int s) : _sock(s), destroy_at_distructor(false), rx_buffer(nullptr) {
-   rx_buffer = shared_ptr<FifoBuffer<uint8_t,RX_BUFFER_DIM>>(new FifoBuffer<uint8_t,RX_BUFFER_DIM>());
+   rx_buffer = std::shared_ptr<FifoBuffer<uint8_t,RX_BUFFER_DIM>>(new FifoBuffer<uint8_t,RX_BUFFER_DIM>());
 }
 /* -------------------------------------------------------------------------- */
 

libraries/WiFiS3/src/WiFiClient.h

@@ -65,7 +65,7 @@ class WiFiClient : public Client {
 protected:
   int _sock;
   void getSocket();
-  shared_ptr<FifoBuffer<uint8_t,RX_BUFFER_DIM>> rx_buffer;
+  std::shared_ptr<FifoBuffer<uint8_t,RX_BUFFER_DIM>> rx_buffer;
   int _read();
   bool read_needed(size_t s);
   void clear_buffer();

libraries/WiFiS3/src/WiFiFileSystem.cpp

@@ -1,5 +1,7 @@
 #include "WiFiFileSystem.h"
 
+using namespace std;
+
 /* -------------------------------------------------------------------------- */
 WiFiFileSystem::WiFiFileSystem() {
 /* -------------------------------------------------------------------------- */

libraries/WiFiS3/src/WiFiSSLClient.cpp

@@ -1,5 +1,7 @@
 #include "WiFiSSLClient.h"
 
+using namespace std;
+
 /* -------------------------------------------------------------------------- */
 WiFiSSLClient::WiFiSSLClient() : _sock(-1){
 /* -------------------------------------------------------------------------- */

libraries/WiFiS3/src/WiFiServer.cpp

@@ -1,5 +1,7 @@
 #include "WiFiServer.h"
 
+using namespace std;
+
 /* -------------------------------------------------------------------------- */
 WiFiServer::WiFiServer() : _sock(-1), _port(80) {}
 /* -------------------------------------------------------------------------- */

libraries/WiFiS3/src/WiFiUdp.cpp

@@ -1,5 +1,7 @@
 #include "WiFiUdp.h"
 
+using namespace std;
+
 /* -------------------------------------------------------------------------- */ 
 WiFiUDP::WiFiUDP() : _sock(-1) {
 /* -------------------------------------------------------------------------- */