Explorar o código

delete Vector

Chris Mullins %!s(int64=8) %!d(string=hai) anos
pai
achega
45a64ecde1
Modificáronse 3 ficheiros con 0 adicións e 76 borrados
  1. 0 1
      lib/Udp/V6MiLightUdpServer.h
  2. 0 74
      lib/Vector/Vector.h
  3. 0 1
      lib/WebServer/PatternHandler.h

+ 0 - 1
lib/Udp/V6MiLightUdpServer.h

@@ -5,7 +5,6 @@
 #include <MiLightClient.h>
 #include <WiFiUdp.h>
 #include <MiLightUdpServer.h>
-#include <Vector.h>
 #include <V6CommandHandler.h>
 
 #define V6_COMMAND_LEN 8

+ 0 - 74
lib/Vector/Vector.h

@@ -1,74 +0,0 @@
-/**
- * Taken from: https://redstoner.com/forums/threads/840-minimal-class-to-replace-std-vector-in-c-for-arduino
- */
- 
-#ifndef _VECTOR_H
-#define _VECTOR_H
-
-// Minimal class to replace std::vector
-template<typename Data>
-class Vector {
-
-    size_t d_size; // Stores no. of actually stored objects
-    size_t d_capacity; // Stores allocated capacity
-    Data *d_data; // Stores data this is this "heap" we need a function that returns a pointer to this value, to print it
-public:
-    Vector() : d_size(0), d_capacity(0), d_data(0) {}; // Default constructor
-
-    Vector(Vector const &other) : d_size(other.d_size), d_capacity(other.d_capacity), d_data(0) //for when you set 1 vector = to another
-    {
-        d_data = (Data *)malloc(d_capacity*sizeof(Data));
-        memcpy(d_data, other.d_data, d_size*sizeof(Data));
-    }; // Copy constuctor
-
-    ~Vector() //this gets called
-    {
-        free(d_data);
-    }; // Destructor
-
-    Vector &operator=(Vector const &other)
-    {
-        free(d_data);
-        d_size = other.d_size;
-        d_capacity = other.d_capacity;
-        d_data = (Data *)malloc(d_capacity*sizeof(Data));
-        memcpy(d_data, other.d_data, d_size*sizeof(Data));
-        return *this;
-    }; // Needed for memory management
-
-    void push_back(Data const &x)
-    {
-        if (d_capacity == d_size) //when he pushes data onto the heap, he checks to see if the storage is full
-            resize();  //if full - resize
-
-        d_data[d_size++] = x;
-    }; // Adds new value. If needed, allocates more space
-
-    void Clear() //here
-    {
-        memset(d_data, 0, d_size);
-        d_capacity = 0;
-        d_size = 0;
-        free(d_data);
-    }
-
-    size_t size() const { return d_size; }; // Size getter
-
-    Data const &operator[](size_t idx) const { return d_data[idx]; }; // Const getter
-
-    Data &operator[](size_t idx) { return d_data[idx]; }; // Changeable getter
-
-    Data *pData() { return (Data*)d_data; }
-
-private:
-    void resize()
-    {
-        d_capacity = d_capacity ? d_capacity * 2 : 1;
-        Data *newdata = (Data *)malloc(d_capacity*sizeof(Data)); //allocates new memory
-        memcpy(newdata, d_data, d_size * sizeof(Data));  //copies all the old memory over
-        free(d_data);                                          //free old
-        d_data = newdata;
-    };// Allocates double the old space
-};
-
-#endif

+ 0 - 1
lib/WebServer/PatternHandler.h

@@ -3,7 +3,6 @@
 
 #include <Arduino.h>
 #include <ESP8266WebServer.h>
-#include <Vector.h>
 #include <functional>
 #include <TokenIterator.h>