Browse Source

Simplify some rename pass code.

pull/787/head
Joao Matos 10 years ago
parent
commit
a531fafa4a
  1. 10
      src/Generator/Passes/RenamePass.cs

10
src/Generator/Passes/RenamePass.cs

@ -141,15 +141,17 @@ namespace CppSharp.Passes
if (decl.Name == null) if (decl.Name == null)
return true; return true;
return Rename(decl); var renamed = Rename(decl);
return true;
} }
private bool Rename(Declaration decl) private bool Rename(Declaration decl)
{ {
string newName; string newName;
if (Rename(decl, out newName) && !AreThereConflicts(decl, newName)) if (!Rename(decl, out newName) || AreThereConflicts(decl, newName))
decl.Name = newName; return false;
decl.Name = newName;
return true; return true;
} }

Loading…
Cancel
Save