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

[Fix] Conflicts

Browse Source
This commit is contained in:
Quentin
2020-04-16 14:04:56 +02:00
parent e77e26e2de 61399d07eb
commit f37040dc8a
335 changed files with 2110 additions and 1685 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/shared/store_controller.cpp
View File

@@ -4,11 +4,10 @@
#include "../constant.h"
#include <escher/metric.h>
#include <assert.h>
#include <algorithm>
using namespace Poincare;
static inline int minInt(int x, int y) { return x < y ? x : y; }
namespace Shared {
StoreController::ContentView::ContentView(DoublePairStore * store, Responder * parentResponder, TableViewDataSource * dataSource, SelectableTableViewDataSource * selectionDataSource, InputEventHandlerDelegate * inputEventHandlerDelegate, TextFieldDelegate * textFieldDelegate) :
@@ -245,7 +244,7 @@ bool StoreController::privateFillColumnWithFormula(Expression formula, Expressio
if (numberOfValuesToCompute == -1) {
numberOfValuesToCompute = m_store->numberOfPairsOfSeries(series);
} else {
numberOfValuesToCompute = minInt(numberOfValuesToCompute, m_store->numberOfPairsOfSeries(series));
numberOfValuesToCompute = std::min(numberOfValuesToCompute, m_store->numberOfPairsOfSeries(series));
}
index++;
}