From 39c2628a7794fc6e88e024d7fc82d52bc833c332 Mon Sep 17 00:00:00 2001 From: Emil Muratov Date: Tue, 7 Sep 2021 22:33:30 +0300 Subject: [PATCH 1/2] Add wrapper namespace to workaround Async Webserver Class name collision Closes #40, superseeds #41 --- LList.h | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 LList.h diff --git a/LList.h b/LList.h new file mode 100644 index 0000000..b2960f6 --- /dev/null +++ b/LList.h @@ -0,0 +1,22 @@ +/* + LinkedList.h - V1.1 - Generic LinkedList implementation + Works better with FIFO, because LIFO will need to + search the entire List to find the last one; + + For instructions, go to https://github.com/ivanseidel/LinkedList + + Created by Ivan Seidel Gomes, March, 2013. + Released into the public domain. +*/ + +/* + This is a namespace wrapper to avoid collision with ESP Async WebServer's LinkedList class + include it instead of and use Class types - LList, LNode +*/ + +namespace LL{ +#include +} + +template using LNode = LL::ListNode; +template using LList = LL::LinkedList; From 088266dbf09068df6e1704bfd8185e1856c4ba47 Mon Sep 17 00:00:00 2001 From: Emil Muratov Date: Tue, 28 Sep 2021 18:35:45 +0300 Subject: [PATCH 2/2] Added guards for STL iterator include Signed-off-by: Emil Muratov --- LList.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/LList.h b/LList.h index b2960f6..0ed5eff 100644 --- a/LList.h +++ b/LList.h @@ -14,9 +14,15 @@ include it instead of and use Class types - LList, LNode */ +#ifndef LList_h +#define LList_h +#include + namespace LL{ #include } + template using LNode = LL::ListNode; template using LList = LL::LinkedList; +#endif \ No newline at end of file