From 2a8fe7ad142f582cb4d743a6886fcc77bb539e30 Mon Sep 17 00:00:00 2001 From: Doug Schaefer Date: Sat, 9 Dec 2006 02:33:28 +0000 Subject: [PATCH] Bug 167311 - Removing the calls to isStatic to make Windows SDK usable. --- .../eclipse/cdt/internal/core/pdom/dom/c/PDOMCAnnotation.java | 2 +- .../cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCAnnotation.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCAnnotation.java index db651c9a264..1fb281af5c2 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCAnnotation.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCAnnotation.java @@ -58,7 +58,7 @@ public class PDOMCAnnotation { modifiers |= (function.isAuto() ? 1 : 0) << PDOMCAnnotation.AUTO_OFFSET; modifiers |= (function.isExtern() ? 1 : 0) << PDOMCAnnotation.EXTERN_OFFSET; modifiers |= (function.isRegister() ? 1 : 0) << PDOMCAnnotation.REGISTER_OFFSET; - modifiers |= (function.isStatic() ? 1 : 0) << PDOMCAnnotation.STATIC_OFFSET; +// modifiers |= (function.isStatic() ? 1 : 0) << PDOMCAnnotation.STATIC_OFFSET; modifiers |= (function.isInline() ? 1 : 0) << PDOMCAnnotation.INLINE_OFFSET; modifiers |= (function.takesVarArgs() ? 1 : 0) << PDOMCAnnotation.VARARGS_OFFSET; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage.java index 5e440f63699..7705d5445c8 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage.java @@ -188,9 +188,9 @@ public class PDOMCPPLinkage extends PDOMLinkage { pdomBinding = new PDOMCPPMethod(pdom, parent, (ICPPMethod)binding); } else if (binding instanceof ICPPFunction) { ICPPFunction func= (ICPPFunction) binding; - if (!func.isStatic()) { // bug 161216 +// if (!func.isStatic()) { // bug 161216 pdomBinding = new PDOMCPPFunction(pdom, parent, func); - } +// } } else if (binding instanceof ICPPClassType) { pdomBinding= new PDOMCPPClassType(pdom, parent, (ICPPClassType) binding); } else if (binding instanceof ICPPNamespaceAlias) {