From e0d221fa4bc0e925ecff904050165e7184108f25 Mon Sep 17 00:00:00 2001 From: mattsc Date: Sat, 8 Apr 2017 13:58:32 -0700 Subject: [PATCH] Fix "no previous prototype" warnings --- src/formula/formula.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/formula/formula.cpp b/src/formula/formula.cpp index 534645f5ae47..48694d96a646 100644 --- a/src/formula/formula.cpp +++ b/src/formula/formula.cpp @@ -31,7 +31,7 @@ using expr_table_ptr = std::shared_ptr; // Function used when creating error reports. // Parses all tokens passed to parse_expression, thus there are no EOL or whitespaces -std::string tokens_to_string(const tk::token* i1, const tk::token* i2) +static std::string tokens_to_string(const tk::token* i1, const tk::token* i2) { std::ostringstream expr; while(i1 != i2) { @@ -1061,7 +1061,7 @@ class string_expression : public formula_expression /** * Functions to handle the actual parsing of WFL. */ -int operator_precedence(const tk::token& t) +static int operator_precedence(const tk::token& t) { static std::map precedence_map; if(precedence_map.empty()) { @@ -1093,7 +1093,7 @@ int operator_precedence(const tk::token& t) return precedence_map[std::string(t.begin, t.end)]; } -void parse_function_args(const tk::token* &i1, const tk::token* i2, std::vector* res) +static void parse_function_args(const tk::token* &i1, const tk::token* i2, std::vector* res) { const tk::token* begin = i1, *end = i2; // These are used for error reporting @@ -1127,7 +1127,7 @@ void parse_function_args(const tk::token* &i1, const tk::token* i2, std::vector< ++i1; } -void parse_args(const tk::token* i1, const tk::token* i2, +static void parse_args(const tk::token* i1, const tk::token* i2, std::vector* res, function_symbol_table* symbols) { @@ -1151,7 +1151,7 @@ void parse_args(const tk::token* i1, const tk::token* i2, } } -void parse_set_args(const tk::token* i1, const tk::token* i2, +static void parse_set_args(const tk::token* i1, const tk::token* i2, std::vector* res, function_symbol_table* symbols) { @@ -1190,7 +1190,7 @@ void parse_set_args(const tk::token* i1, const tk::token* i2, } } -void parse_where_clauses(const tk::token* i1, const tk::token* i2, expr_table_ptr res, function_symbol_table* symbols) +static void parse_where_clauses(const tk::token* i1, const tk::token* i2, expr_table_ptr res, function_symbol_table* symbols) { int parens = 0; const tk::token* original_i1_cached = i1;