forked from kimwalisch/calculator
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
icl /W4: remark #3280: declaration hides member
- Loading branch information
1 parent
0c48ea1
commit 9198e85
Showing
1 changed file
with
6 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,7 +6,7 @@ | |
/// <https://github.com/kimwalisch/calculator> | ||
/// @author Kim Walisch, <[email protected]> | ||
/// @copyright Copyright (C) 2013 Kim Walisch | ||
/// @date November 8, 2013 | ||
/// @date November 30, 2013 | ||
/// @license BSD 2-Clause, http://opensource.org/licenses/BSD-2-Clause | ||
/// @version 1.0 | ||
/// | ||
|
@@ -153,20 +153,20 @@ class ExpressionParser | |
int precedence; | ||
/// 'L' = left or 'R' = right | ||
int associativity; | ||
Operator(int opr, int precedence, int associativity) : | ||
Operator(int opr, int prec, int assoc) : | ||
op(opr), | ||
precedence(precedence), | ||
associativity(associativity) | ||
precedence(prec), | ||
associativity(assoc) | ||
{ } | ||
}; | ||
|
||
struct OperatorValue | ||
{ | ||
Operator op; | ||
T value; | ||
OperatorValue(const Operator& opr, T value) : | ||
OperatorValue(const Operator& opr, T val) : | ||
op(opr), | ||
value(value) | ||
value(val) | ||
{ } | ||
int getPrecedence() const | ||
{ | ||
|