Explorar el Código

Avoid name clash with class WebSocketClient by explicit qualification (#2616)

Adds an explicit namespace qualification and a forward declaration for
class WebSocketClient. This change avoids a name clash on code bases
containing unrelated WebSocketClient classes.
Michael Weitzel hace 12 horas
padre
commit
57b8aca6da
Se han modificado 1 ficheros con 3 adiciones y 1 borrados
  1. 3 1
      httplib.h

+ 3 - 1
httplib.h

@@ -4412,6 +4412,8 @@ private:
 
 namespace ws {
 
+class WebSocketClient;
+
 enum class Opcode : uint8_t {
   Continuation = 0x0,
   Text = 0x1,
@@ -4513,7 +4515,7 @@ public:
 
 private:
   friend class httplib::Server;
-  friend class WebSocketClient;
+  friend class httplib::ws::WebSocketClient;
 
   WebSocket(
       Stream &strm, const Request &req, bool is_server,