Skip to content

Commit 600cdfe

Browse files
committed
Rename args to __args to avoid collision
1 parent 5cc91f7 commit 600cdfe

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

cpp2rust/converter/converter.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1363,7 +1363,8 @@ std::optional<std::string> Converter::TryPluginConvert(clang::CallExpr *call) {
13631363

13641364
void Converter::ConvertVAArgCall(clang::CallExpr *expr) {
13651365
if (IsBuiltinVaStart(expr)) {
1366-
StrCat(ToString(expr->getArg(0)->IgnoreImpCasts()), "= VaList::new(args)");
1366+
StrCat(ToString(expr->getArg(0)->IgnoreImpCasts()),
1367+
"= VaList::new(__args)");
13671368
return;
13681369
}
13691370
if (IsBuiltinVaEnd(expr)) {
@@ -3295,7 +3296,7 @@ void Converter::ConvertFunctionParameters(clang::FunctionDecl *decl) {
32953296
StrCat(token::kComma);
32963297
}
32973298
if (decl->isVariadic()) {
3298-
StrCat("args: &[VaArg]", token::kComma);
3299+
StrCat("__args: &[VaArg]", token::kComma);
32993300
}
33003301
in_function_formals_ = false;
33013302
}

0 commit comments

Comments
 (0)