Move the templates/objects to their own namespaces

earlephilhower · earlephilhower · commit 3a8e1d4df8d0 · 2019-04-12T13:31:58.000-07:00
diff --git a/libraries/ESP8266HTTPUpdateServer/src/ESP8266HTTPUpdateServer-impl.h b/libraries/ESP8266HTTPUpdateServer/src/ESP8266HTTPUpdateServer-impl.h
@@ -6,6 +6,8 @@
 #include "StreamString.h"
 #include "ESP8266HTTPUpdateServer.h"
 
+namespace esp8266httpupdateserver {
+using namespace esp8266webserver;
 
 static const char serverIndex[] PROGMEM =
   R"(<html><body><form method='POST' action='' enctype='multipart/form-data'>
@@ -105,3 +107,5 @@ void ESP8266HTTPUpdateServerTemplate<ServerType>::_setUpdaterError()
   Update.printError(str);
   _updaterError = str.c_str();
 }
+
+};
diff --git a/libraries/ESP8266HTTPUpdateServer/src/ESP8266HTTPUpdateServer.h b/libraries/ESP8266HTTPUpdateServer/src/ESP8266HTTPUpdateServer.h
@@ -3,6 +3,9 @@
 
 #include <ESP8266WebServer.h>
 
+namespace esp8266httpupdateserver {
+using namespace esp8266webserver;
+
 template <typename ServerType>
 class ESP8266HTTPUpdateServerTemplate
 {
@@ -44,17 +47,19 @@ class ESP8266HTTPUpdateServerTemplate
     String _updaterError;
 };
 
+};
+
 #include "ESP8266HTTPUpdateServer-impl.h"
 
 
-using ESP8266HTTPUpdateServer = ESP8266HTTPUpdateServerTemplate<WiFiServer>;
+using ESP8266HTTPUpdateServer = esp8266httpupdateserver::ESP8266HTTPUpdateServerTemplate<WiFiServer>;
 
 namespace BearSSL {
-using ESP8266HTTPUpdateServerSecure = ESP8266HTTPUpdateServerTemplate<WiFiServerSecure>;
+using ESP8266HTTPUpdateServerSecure = esp8266httpupdateserver::ESP8266HTTPUpdateServerTemplate<WiFiServerSecure>;
 };
 
 namespace axTLS {
-using ESP8266HTTPUpdateServerSecure = ESP8266HTTPUpdateServerTemplate<WiFiServerSecure>;
+using ESP8266HTTPUpdateServerSecure = esp8266httpupdateserver::ESP8266HTTPUpdateServerTemplate<WiFiServerSecure>;
 };
 
 #endif
diff --git a/libraries/ESP8266WebServer/src/ESP8266WebServer.h b/libraries/ESP8266WebServer/src/ESP8266WebServer.h
@@ -28,6 +28,7 @@
 #include <memory>
 #include <ESP8266WiFi.h>
 #include <FS.h>
+#include "detail/mimetable.h"
 
 enum HTTPMethod { HTTP_ANY, HTTP_GET, HTTP_POST, HTTP_PUT, HTTP_PATCH, HTTP_DELETE, HTTP_OPTIONS };
 enum HTTPUploadStatus { UPLOAD_FILE_START, UPLOAD_FILE_WRITE, UPLOAD_FILE_END,
@@ -49,9 +50,6 @@ enum HTTPAuthMethod { BASIC_AUTH, DIGEST_AUTH };
 #define CONTENT_LENGTH_UNKNOWN ((size_t) -1)
 #define CONTENT_LENGTH_NOT_SET ((size_t) -2)
 
-template<typename ServerType>
-class ESP8266WebServerTemplate;
-
 typedef struct {
   HTTPUploadStatus status;
   String  filename;
@@ -63,6 +61,11 @@ typedef struct {
   uint8_t buf[HTTP_UPLOAD_BUFLEN];
 } HTTPUpload;
 
+namespace esp8266webserver {
+
+template<typename ServerType>
+class ESP8266WebServerTemplate;
+
 #include "detail/RequestHandler.h"
 
 template<typename ServerType>
@@ -201,11 +204,13 @@ class ESP8266WebServerTemplate
 
 };
 
-
 #include "ESP8266WebServer-impl.h"
 #include "Parsing-impl.h"
 
-using ESP8266WebServer = ESP8266WebServerTemplate<WiFiServer>;
+};
+
+
+using ESP8266WebServer = esp8266webserver::ESP8266WebServerTemplate<WiFiServer>;
 
 
 #endif //ESP8266WEBSERVER_H
diff --git a/libraries/ESP8266WebServer/src/ESP8266WebServerSecure.h b/libraries/ESP8266WebServer/src/ESP8266WebServerSecure.h
@@ -23,9 +23,9 @@
 #include <WiFiClientSecure.h>
 
 namespace axTLS {
-  using ESP8266WebServerSecure = ESP8266WebServerTemplate<WiFiServerSecure>;
+  using ESP8266WebServerSecure = esp8266webserver::ESP8266WebServerTemplate<WiFiServerSecure>;
 };
 
 namespace BearSSL {
-  using ESP8266WebServerSecure = ESP8266WebServerTemplate<WiFiServerSecure>;
+  using ESP8266WebServerSecure = esp8266webserver::ESP8266WebServerTemplate<WiFiServerSecure>;
 };
