aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/node/scalaroperatornode.h
diff options
context:
space:
mode:
authorRenaud G <renaud@rolisteam.org>2016-01-10 17:55:32 +0100
committerRenaud G <renaud@rolisteam.org>2016-01-10 17:55:32 +0100
commit7df15a3d41d87bbed9155a5cff2fda70acbf2f0e (patch)
tree12acda80f00901f06ec72e77a2ac3aab9e03f9b2 /node/scalaroperatornode.h
parent20812f196cfba490952d2e148b4e321c10cbad7e (diff)
parentdb15e41502743d1124062eddb8d2bb3617e2593c (diff)
downloadOneRoll-7df15a3d41d87bbed9155a5cff2fda70acbf2f0e.tar.gz
OneRoll-7df15a3d41d87bbed9155a5cff2fda70acbf2f0e.zip
merge MergeOp into master
Diffstat (limited to 'node/scalaroperatornode.h')
-rw-r--r--node/scalaroperatornode.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/node/scalaroperatornode.h b/node/scalaroperatornode.h
index ea0f7e1..ca6f3ac 100644
--- a/node/scalaroperatornode.h
+++ b/node/scalaroperatornode.h
@@ -53,10 +53,10 @@ public:
virtual QMap<ExecutionNode::ERROR_CODE,QString> getExecutionErrorMap();
private:
- qint64 add(qint64,qint64);
- qint64 substract(qint64,qint64);
+ static qint64 add(qint64,qint64);
+ static qint64 substract(qint64,qint64);
qreal divide(qint64,qint64);
- qint64 multiple(qint64,qint64);
+ static qint64 multiple(qint64,qint64);
private:
ScalarOperator m_operator;