From 09dde693ba91d6f315dc0ce7849851184f488024 Mon Sep 17 00:00:00 2001 From: probonopd Date: Wed, 22 Mar 2017 10:23:37 +0100 Subject: [PATCH] Solve error "previous definition of 'class fs::File'" (#147) As per https://github.com/me-no-dev/ESPAsyncWebServer/issues/111#issuecomment-288265916 by @boblemaire --- src/ESPAsyncWebServer.h | 2 ++ src/WebHandlerImpl.h | 2 ++ src/WebResponseImpl.h | 2 ++ 3 files changed, 6 insertions(+) diff --git a/src/ESPAsyncWebServer.h b/src/ESPAsyncWebServer.h index 4af8ff2..e0fdfeb 100644 --- a/src/ESPAsyncWebServer.h +++ b/src/ESPAsyncWebServer.h @@ -116,6 +116,8 @@ class AsyncWebHeader { typedef std::function AwsResponseFiller; class AsyncWebServerRequest { + using File = fs::File; + using FS = fs::FS; friend class AsyncWebServer; private: AsyncClient* _client; diff --git a/src/WebHandlerImpl.h b/src/WebHandlerImpl.h index 58e6b82..101f5bb 100644 --- a/src/WebHandlerImpl.h +++ b/src/WebHandlerImpl.h @@ -26,6 +26,8 @@ #include class AsyncStaticWebHandler: public AsyncWebHandler { + using File = fs::File; + using FS = fs::FS; private: bool _getFile(AsyncWebServerRequest *request); bool _fileExists(AsyncWebServerRequest *request, const String& path); diff --git a/src/WebResponseImpl.h b/src/WebResponseImpl.h index e0f4403..f234bf8 100644 --- a/src/WebResponseImpl.h +++ b/src/WebResponseImpl.h @@ -42,6 +42,8 @@ class AsyncAbstractResponse: public AsyncWebServerResponse { }; class AsyncFileResponse: public AsyncAbstractResponse { + using File = fs::File; + using FS = fs::FS; private: File _content; String _path;