diff options
| -rwxr-xr-x[-rw-r--r--] | core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/NodeHelper.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/NodeHelper.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/NodeHelper.java index 2e8d2f95fde..51b79dc4d55 100644..100755 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/NodeHelper.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/NodeHelper.java @@ -16,7 +16,9 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.Path; +import org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier; import org.eclipse.cdt.core.dom.ast.IASTDeclaration; +import org.eclipse.cdt.core.dom.ast.IASTDeclarator; import org.eclipse.cdt.core.dom.ast.IASTFunctionDeclarator; import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition; import org.eclipse.cdt.core.dom.ast.IASTName; @@ -25,6 +27,7 @@ import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclaration; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.dom.ast.IBinding; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCompositeTypeSpecifier; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTDeclSpecifier; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTFunctionDeclarator; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTQualifiedName; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTemplateDeclaration; @@ -128,8 +131,13 @@ public class NodeHelper { if (simpleDeclaration == null) { return false; } - return simpleDeclaration.getDeclarators().length == 1 && - simpleDeclaration.getDeclarators()[0] instanceof ICPPASTFunctionDeclarator; + final IASTDeclSpecifier declSpecifier = simpleDeclaration.getDeclSpecifier(); + final IASTDeclarator[] declarators = simpleDeclaration.getDeclarators(); + if ((declSpecifier instanceof ICPPASTDeclSpecifier) + && ((ICPPASTDeclSpecifier) declSpecifier).isFriend()) { + return false; + } + return declarators.length == 1 && declarators[0] instanceof ICPPASTFunctionDeclarator; } public static boolean isContainedInTemplateDeclaration(IASTNode node) { |