Skip to content

Commit

Permalink
Solve error "previous definition of 'class fs::File'" (#147)
Browse files Browse the repository at this point in the history
  • Loading branch information
probonopd authored and me-no-dev committed Mar 22, 2017
1 parent 1b35f15 commit 09dde69
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/ESPAsyncWebServer.h
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,8 @@ class AsyncWebHeader {
typedef std::function<size_t(uint8_t*, size_t, size_t)> AwsResponseFiller;

class AsyncWebServerRequest {
using File = fs::File;
using FS = fs::FS;
friend class AsyncWebServer;
private:
AsyncClient* _client;
Expand Down
2 changes: 2 additions & 0 deletions src/WebHandlerImpl.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
#include <time.h>

class AsyncStaticWebHandler: public AsyncWebHandler {
using File = fs::File;
using FS = fs::FS;
private:
bool _getFile(AsyncWebServerRequest *request);
bool _fileExists(AsyncWebServerRequest *request, const String& path);
Expand Down
2 changes: 2 additions & 0 deletions src/WebResponseImpl.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 09dde69

Please sign in to comment.