diff --git a/src/cpp11.cpp b/src/cpp11.cpp index c2c374d7c..b42b45ac2 100644 --- a/src/cpp11.cpp +++ b/src/cpp11.cpp @@ -438,8 +438,8 @@ static const R_CallMethodDef CallEntries[] = { {"_duckdb_rapi_disconnect", (DL_FUNC) &_duckdb_rapi_disconnect, 1}, {"_duckdb_rapi_execute", (DL_FUNC) &_duckdb_rapi_execute, 3}, {"_duckdb_rapi_execute_arrow", (DL_FUNC) &_duckdb_rapi_execute_arrow, 2}, - {"_duckdb_rapi_expr_constant", (DL_FUNC) &_duckdb_rapi_expr_constant, 1}, {"_duckdb_rapi_expr_comparison", (DL_FUNC) &_duckdb_rapi_expr_comparison, 2}, + {"_duckdb_rapi_expr_constant", (DL_FUNC) &_duckdb_rapi_expr_constant, 1}, {"_duckdb_rapi_expr_function", (DL_FUNC) &_duckdb_rapi_expr_function, 4}, {"_duckdb_rapi_expr_reference", (DL_FUNC) &_duckdb_rapi_expr_reference, 1}, {"_duckdb_rapi_expr_set_alias", (DL_FUNC) &_duckdb_rapi_expr_set_alias, 2}, diff --git a/src/reltoaltrep.cpp b/src/reltoaltrep.cpp index 1e565c375..f295072b3 100644 --- a/src/reltoaltrep.cpp +++ b/src/reltoaltrep.cpp @@ -110,16 +110,15 @@ struct AltrepRelationWrapper { // https://github.com/duckdb/duckdb-r/issues/101 auto old_depth = rel->context.GetContext()->config.max_expression_depth; rel->context.GetContext()->config.max_expression_depth = old_depth * 2; - duckdb_httplib::detail::scope_exit reset_max_expression_depth([&]() { - rel->context.GetContext()->config.max_expression_depth = old_depth; - }); + duckdb_httplib::detail::scope_exit reset_max_expression_depth( + [&]() { rel->context.GetContext()->config.max_expression_depth = old_depth; }); res = rel->Execute(); // FIXME: Use std::experimental::scope_exit if (rel->context.GetContext()->config.max_expression_depth != old_depth * 2) { - Rprintf("Internal error: max_expression_depth was changed from %" PRIu64 " to %" PRIu64 "\n", old_depth * 2, - rel->context.GetContext()->config.max_expression_depth); + Rprintf("Internal error: max_expression_depth was changed from %" PRIu64 " to %" PRIu64 "\n", + old_depth * 2, rel->context.GetContext()->config.max_expression_depth); } rel->context.GetContext()->config.max_expression_depth = old_depth; reset_max_expression_depth.release();