diff options
| author | 2015-10-11 15:49:38 +0200 | |
|---|---|---|
| committer | 2015-10-11 15:49:38 +0200 | |
| commit | 84691771b54365160f5b1d54033e00187dbbf043 (patch) | |
| tree | dd17a1436659c48993bfdb846864dded708c411e /node/scalaroperatornode.cpp | |
| parent | a220f89b6f30716883223292b0986c0dc9d941bc (diff) | |
| parent | 114cd6a7990c44f0610dbf2080f101d0edbbaa57 (diff) | |
| download | OneRoll-84691771b54365160f5b1d54033e00187dbbf043.tar.gz OneRoll-84691771b54365160f5b1d54033e00187dbbf043.zip | |
Merge branch 'master' of github.com:Rolisteam/DiceParser
Diffstat (limited to 'node/scalaroperatornode.cpp')
| -rw-r--r-- | node/scalaroperatornode.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/node/scalaroperatornode.cpp b/node/scalaroperatornode.cpp index c5f91f9..d532df0 100644 --- a/node/scalaroperatornode.cpp +++ b/node/scalaroperatornode.cpp @@ -26,7 +26,7 @@ ScalarOperatorNode::ScalarOperatorNode() - : m_internalNode(NULL),m_scalarResult(new ScalarResult()) + : m_internalNode(NULL),m_scalarResult(new ScalarResult()),m_operator(PLUS) { m_scalarOperationList.insert('+',PLUS); m_scalarOperationList.insert('-',MINUS); |