Skip to content

Commit

Permalink
Silence compiler warning
Browse files Browse the repository at this point in the history
icl /W4:  remark #3280: declaration hides member
  • Loading branch information
kimwalisch committed Nov 30, 2013
1 parent 0c48ea1 commit 9198e85
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions calculator.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
///
Expand Down Expand Up @@ -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
{
Expand Down

0 comments on commit 9198e85

Please sign in to comment.