fix dtors

1 files changed, 7 insertions, 3 deletions

diff --git a/clang/rename.cxx b/clang/rename.cxx
index d777f76..51b121e 100644
--- a/clang/rename.cxx
+++ b/clang/rename.cxx
@@ -239,18 +239,22 @@ public:
     {
         std::string aName = pDecl->getNameAsString();
         std::string aPrefix("~");
-        if (pDecl->isThisDeclarationADefinition())
+        if (pDecl->getLocStart() != pDecl->getLocation())
+        {
             /*
              * Foo::~Foo(...) {}
              * ^~~ Handles this.
              */
-            RewriteText(pDecl->getLocStart(), pDecl->getNameAsString().length() - aPrefix.size(), aName.substr(aPrefix.size()));
+            if (!HasNamespace(aName.substr(aPrefix.size())) || pDecl->isThisDeclarationADefinition())
+                RewriteText(pDecl->getLocStart(), pDecl->getNameAsString().length() - aPrefix.size(), aName.substr(aPrefix.size()));
+        }
 
         /*
          * Foo::~Foo(...) {}
          *      ^~~ Handles this.
          */
-        RewriteText(pDecl->getLocation(), pDecl->getNameAsString().length(), aName, aPrefix);
+        if (!HasNamespace(aName.substr(aPrefix.size())))
+            RewriteText(pDecl->getLocation(), pDecl->getNameAsString().length(), aName, aPrefix);
 
         return true;
     }