Skip to content

Commit 7e40b9f

Browse files
committed
Remove some definitions from global namespace
Names like kB, MB and kHz are likely to collide with variable names in user sketches. Nowadays this should be implemented using c++14 user-defined literals (http://en.cppreference.com/w/cpp/language/user_literal)
1 parent cdd2fed commit 7e40b9f

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

hardware/esp8266com/esp8266/cores/esp8266/Arduino.h

-12
Original file line numberDiff line numberDiff line change
@@ -82,18 +82,6 @@ void yield(void);
8282
#define degrees(rad) ((rad)*RAD_TO_DEG)
8383
#define sq(x) ((x)*(x))
8484

85-
#define kHz (1000L)
86-
#define MHz (1000L*kHz)
87-
#define GHz (1000L*MHz)
88-
89-
#define kBit (1024L)
90-
#define MBit (1024L*kBit)
91-
#define GBit (1024L*MBit)
92-
93-
#define kB (1024L)
94-
#define MB (1024L*kB)
95-
#define GB (1024L*MB)
96-
9785
void ets_intr_lock();
9886
void ets_intr_unlock();
9987

hardware/esp8266com/esp8266/cores/esp8266/Esp.cpp

+11
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,17 @@ extern "C" {
2424
#include "user_interface.h"
2525
}
2626

27+
#define kHz (1000L)
28+
#define MHz (1000L*kHz)
29+
#define GHz (1000L*MHz)
30+
31+
#define kBit (1024L)
32+
#define MBit (1024L*kBit)
33+
#define GBit (1024L*MBit)
34+
35+
#define kB (1024L)
36+
#define MB (1024L*kB)
37+
#define GB (1024L*MB)
2738

2839
//extern "C" void ets_wdt_init(uint32_t val);
2940
extern "C" void ets_wdt_enable(void);

0 commit comments

Comments
 (0)