Skip to content

Commit d9b88b6

Browse files
committed
fix(net): Use typedefs instead to help with forward declarations
Defines do not allow forward declarations
1 parent 8f13096 commit d9b88b6

File tree

5 files changed

+7
-16
lines changed

5 files changed

+7
-16
lines changed
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
#pragma once
2-
#warning WiFiClientSecure has been deprecated, please use NetworkClientSecure instead.
32
#include "NetworkClientSecure.h"
4-
#define WiFiClientSecure NetworkClientSecure
3+
typedef NetworkClientSecure WiFiClientSecure;

libraries/WiFi/src/WiFi.h

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,9 @@
3535
#include "WiFiScan.h"
3636
#include "WiFiGeneric.h"
3737

38-
#include "NetworkClient.h"
39-
#include "NetworkServer.h"
40-
#include "NetworkUdp.h"
41-
//defines are added here not to cause warnings
42-
//to be removed in the future
43-
#define WiFiClient NetworkClient
44-
#define WiFiServer NetworkServer
45-
#define WiFiUDP NetworkUDP
38+
#include "WiFiClient.h"
39+
#include "WiFiServer.h"
40+
#include "WiFiUdp.h"
4641

4742
class WiFiClass : public WiFiGenericClass, public WiFiSTAClass, public WiFiScanClass, public WiFiAPClass {
4843
private:

libraries/WiFi/src/WiFiClient.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
#pragma once
2-
#warning WiFiClient has been deprecated, please use NetworkClient instead.
32
#include "NetworkClient.h"
4-
#define WiFiClient NetworkClient
3+
typedef NetworkClient WiFiClient;

libraries/WiFi/src/WiFiServer.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
#pragma once
2-
#warning WiFiServer has been deprecated, please use NetworkServer instead.
32
#include "NetworkServer.h"
4-
#define WiFiServer NetworkServer
3+
typedef NetworkServer WiFiServer;

libraries/WiFi/src/WiFiUdp.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
#pragma once
2-
#warning WiFiUDP has been deprecated, please use NetworkUDP instead.
32
#include "NetworkUdp.h"
4-
#define WiFiUDP NetworkUDP
3+
typedef NetworkUDP WiFiUDP;

0 commit comments

Comments
 (0)