Commit 1a7c996a authored by Christopher Dembia's avatar Christopher Dembia
Browse files

Fix lepton size_t VS2013 warnings by casting to int.

parent 0c00acd2
...@@ -84,13 +84,13 @@ void CompiledExpression::compileExpression(const ExpressionTreeNode& node, vecto ...@@ -84,13 +84,13 @@ void CompiledExpression::compileExpression(const ExpressionTreeNode& node, vecto
// Process this node. // Process this node.
if (node.getOperation().getId() == Operation::VARIABLE) { if (node.getOperation().getId() == Operation::VARIABLE) {
variableIndices[node.getOperation().getName()] = workspace.size(); variableIndices[node.getOperation().getName()] = (int) workspace.size();
variableNames.insert(node.getOperation().getName()); variableNames.insert(node.getOperation().getName());
} }
else { else {
int stepIndex = arguments.size(); int stepIndex = (int) arguments.size();
arguments.push_back(vector<int>()); arguments.push_back(vector<int>());
target.push_back(workspace.size()); target.push_back((int) workspace.size());
operation.push_back(node.getOperation().clone()); operation.push_back(node.getOperation().clone());
if (args.size() == 0) if (args.size() == 0)
arguments[stepIndex].push_back(0); // The value won't actually be used. We just need something there. arguments[stepIndex].push_back(0); // The value won't actually be used. We just need something there.
......
...@@ -71,13 +71,13 @@ ExpressionProgram& ExpressionProgram::operator=(const ExpressionProgram& program ...@@ -71,13 +71,13 @@ ExpressionProgram& ExpressionProgram::operator=(const ExpressionProgram& program
} }
void ExpressionProgram::buildProgram(const ExpressionTreeNode& node) { void ExpressionProgram::buildProgram(const ExpressionTreeNode& node) {
for (int i = node.getChildren().size()-1; i >= 0; i--) for (int i = (int) node.getChildren().size()-1; i >= 0; i--)
buildProgram(node.getChildren()[i]); buildProgram(node.getChildren()[i]);
operations.push_back(node.getOperation().clone()); operations.push_back(node.getOperation().clone());
} }
int ExpressionProgram::getNumOperations() const { int ExpressionProgram::getNumOperations() const {
return operations.size(); return (int) operations.size();
} }
const Operation& ExpressionProgram::getOperation(int index) const { const Operation& ExpressionProgram::getOperation(int index) const {
......
...@@ -60,7 +60,7 @@ double ParsedExpression::evaluate(const map<string, double>& variables) const { ...@@ -60,7 +60,7 @@ double ParsedExpression::evaluate(const map<string, double>& variables) const {
} }
double ParsedExpression::evaluate(const ExpressionTreeNode& node, const map<string, double>& variables) { double ParsedExpression::evaluate(const ExpressionTreeNode& node, const map<string, double>& variables) {
int numArgs = node.getChildren().size(); int numArgs = (int) node.getChildren().size();
vector<double> args(max(numArgs, 1)); vector<double> args(max(numArgs, 1));
for (int i = 0; i < numArgs; i++) for (int i = 0; i < numArgs; i++)
args[i] = evaluate(node.getChildren()[i], variables); args[i] = evaluate(node.getChildren()[i], variables);
......
...@@ -70,7 +70,7 @@ string Parser::trim(const string& expression) { ...@@ -70,7 +70,7 @@ string Parser::trim(const string& expression) {
int start, end; int start, end;
for (start = 0; start < (int) expression.size() && isspace(expression[start]); start++) for (start = 0; start < (int) expression.size() && isspace(expression[start]); start++)
; ;
for (end = expression.size()-1; end > start && isspace(expression[end]); end--) for (end = (int) expression.size()-1; end > start && isspace(expression[end]); end--)
; ;
if (start == end && isspace(expression[end])) if (start == end && isspace(expression[end]))
return ""; return "";
...@@ -140,7 +140,7 @@ vector<ParseToken> Parser::tokenize(const string& expression) { ...@@ -140,7 +140,7 @@ vector<ParseToken> Parser::tokenize(const string& expression) {
ParseToken token = getNextToken(expression, pos); ParseToken token = getNextToken(expression, pos);
if (token.getType() != ParseToken::Whitespace) if (token.getType() != ParseToken::Whitespace)
tokens.push_back(token); tokens.push_back(token);
pos += token.getText().size(); pos += (int) token.getText().size();
} }
return tokens; return tokens;
} }
...@@ -257,7 +257,7 @@ ExpressionTreeNode Parser::parsePrecedence(const vector<ParseToken>& tokens, int ...@@ -257,7 +257,7 @@ ExpressionTreeNode Parser::parsePrecedence(const vector<ParseToken>& tokens, int
while (pos < (int) tokens.size() && tokens[pos].getType() == ParseToken::Operator) { while (pos < (int) tokens.size() && tokens[pos].getType() == ParseToken::Operator) {
token = tokens[pos]; token = tokens[pos];
int opIndex = Operators.find(token.getText()); int opIndex = (int) Operators.find(token.getText());
int opPrecedence = Precedence[opIndex]; int opPrecedence = Precedence[opIndex];
if (opPrecedence < precedence) if (opPrecedence < precedence)
return result; return result;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment