Skip to content

Commit 942a8a3

Browse files
committed
avoid adafruit_GFX_AS macro collision
by removing the member function
1 parent ebddadd commit 942a8a3

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

src/items.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,8 @@
246246
void clearChanged(const navNode &nav,const menuOut& out,bool sub) override;
247247
inline idx_t sz() const {return ((menuNodeShadow*)shadow)->_sz();}
248248
inline prompt* constMEM* data() const {return ((menuNodeShadow*)shadow)->_data();}
249-
#ifdef MENU_USERAM
249+
#if defined(MENU_USERAM) && ! defined(swap)
250+
//Adafruit_GFX_AS defines swap macro (what a bad idea)
250251
void swap(idx_t a,idx_t b) {
251252
if (has(_menuData)) {//ignore on virtual data menus
252253
auto ops=((menuNodeShadow*)shadow)->_data();

0 commit comments

Comments
 (0)