UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps] Add missing min/max redefinition

Browse Source
This commit is contained in:
Émilie Feral
2018-09-04 11:59:09 +02:00
committed by LeaNumworks
parent b2b0f4fab0
commit 0b71e92625
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/code/python_text_area.cpp
View File

@@ -17,6 +17,8 @@ constexpr KDColor OperatorColor = KDColor::RGB24(0xd73a49);
constexpr KDColor StringColor = KDColor::RGB24(0x032f62);
constexpr KDColor BackgroundColor = KDColorWhite;
static inline int min(int x, int y) { return (x<y ? x : y); }
static inline KDColor TokenColor(mp_token_kind_t tokenKind) {
if (tokenKind == MP_TOKEN_STRING) {
return StringColor;

3
apps/shared/store_controller.cpp
View File

@@ -7,6 +7,9 @@
using namespace Poincare;
static inline int min(int x, int y) { return (x<y ? x : y); }
static inline int max(int x, int y) { return (x>y ? x : y); }
namespace Shared {
StoreController::ContentView::ContentView(DoublePairStore * store, Responder * parentResponder, TableViewDataSource * dataSource, SelectableTableViewDataSource * selectionDataSource, TextFieldDelegate * textFieldDelegate) :