Solve error "previous definition of 'class fs::File'" (#147)

As per https://github.com/me-no-dev/ESPAsyncWebServer/issues/111#issuecomment-288265916 by @boblemaire
This commit is contained in:
probonopd 2017-03-22 10:23:37 +01:00 committed by Me No Dev
parent 1b35f15ec2
commit 09dde693ba
3 changed files with 6 additions and 0 deletions

View File

@ -116,6 +116,8 @@ class AsyncWebHeader {
typedef std::function<size_t(uint8_t*, size_t, size_t)> AwsResponseFiller; typedef std::function<size_t(uint8_t*, size_t, size_t)> AwsResponseFiller;
class AsyncWebServerRequest { class AsyncWebServerRequest {
using File = fs::File;
using FS = fs::FS;
friend class AsyncWebServer; friend class AsyncWebServer;
private: private:
AsyncClient* _client; AsyncClient* _client;

View File

@ -26,6 +26,8 @@
#include <time.h> #include <time.h>
class AsyncStaticWebHandler: public AsyncWebHandler { class AsyncStaticWebHandler: public AsyncWebHandler {
using File = fs::File;
using FS = fs::FS;
private: private:
bool _getFile(AsyncWebServerRequest *request); bool _getFile(AsyncWebServerRequest *request);
bool _fileExists(AsyncWebServerRequest *request, const String& path); bool _fileExists(AsyncWebServerRequest *request, const String& path);

View File

@ -42,6 +42,8 @@ class AsyncAbstractResponse: public AsyncWebServerResponse {
}; };
class AsyncFileResponse: public AsyncAbstractResponse { class AsyncFileResponse: public AsyncAbstractResponse {
using File = fs::File;
using FS = fs::FS;
private: private:
File _content; File _content;
String _path; String _path;