This commit is contained in:
Ari Lazier 2016-01-08 11:37:05 -08:00
parent b5fb267e11
commit d0715cc8e4
4 changed files with 5 additions and 5 deletions

View File

@ -334,7 +334,7 @@ Predicate parse(const std::string &query)
return std::move(out_predicate);
}
void analyzeGrammar()
void analyze_grammar()
{
analyze<pred>();
}

View File

@ -78,8 +78,8 @@ struct Predicate
Predicate parse(const std::string &query);
void analyzeGrammar();
bool testGrammar();
void analyze_grammar();
bool test_grammar();
}
}

View File

@ -371,7 +371,7 @@ auto value_of_type_for_query(TableGetter&& tables, Value&& value, Arguments &arg
{
const bool isColumn = std::is_same<PropertyExpression, typename std::remove_reference<Value>::type>::value;
using helper = std::conditional_t<isColumn, ColumnGetter<RetType, TableGetter>, ValueGetter<RetType, TableGetter>>;
return helper::convert(std::forward<TableGetter>(tables), std::forward<Value>(value), args);
return helper::convert(tables, value, args);
}
template <typename A, typename B>

View File

@ -134,7 +134,7 @@ static std::vector<std::string> invalid_queries = {
namespace realm {
namespace parser {
bool testGrammar()
bool test_grammar()
{
bool success = true;
for (auto &query : valid_queries) {