mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-06-07 09:46:02 +02:00
Bug 113364: Wrong values displaying an array of structures.
Previous fix didn't work for classes with access specifiers.
This commit is contained in:
parent
ecdeab8ddc
commit
588b729fb6
3 changed files with 9 additions and 2 deletions
|
@ -1,3 +1,9 @@
|
||||||
|
2005-11-02 Mikhail Khodjaiants
|
||||||
|
Bug 113364: Wrong values displaying an array of structures.
|
||||||
|
Previous fix didn't work for classes with access specifiers.
|
||||||
|
* cdi/org/eclipse/cdt/debug/mi/core/cdi/VariableManager.java
|
||||||
|
* cdi/org/eclipse/cdt/debug/mi/core/cdi/model/VariableDescriptor.java
|
||||||
|
|
||||||
2005-10-21 Mikhail Khodjaiants
|
2005-10-21 Mikhail Khodjaiants
|
||||||
Bug 113364: Wrong values displaying an array of structures.
|
Bug 113364: Wrong values displaying an array of structures.
|
||||||
* cdi/org/eclipse/cdt/debug/mi/core/cdi/VariableManager.java
|
* cdi/org/eclipse/cdt/debug/mi/core/cdi/VariableManager.java
|
||||||
|
|
|
@ -126,12 +126,12 @@ public class VariableManager extends Manager {
|
||||||
Target target = (Target)v.getTarget();
|
Target target = (Target)v.getTarget();
|
||||||
ICDIStackFrame vstack = v.getStackFrame();
|
ICDIStackFrame vstack = v.getStackFrame();
|
||||||
ICDIThread vthread = v.getThread();
|
ICDIThread vthread = v.getThread();
|
||||||
String name = v.getFullName();
|
|
||||||
int position = v.getPosition();
|
int position = v.getPosition();
|
||||||
int depth = v.getStackDepth();
|
int depth = v.getStackDepth();
|
||||||
Variable[] vars = getVariables(target);
|
Variable[] vars = getVariables(target);
|
||||||
for (int i = 0; i < vars.length; i++) {
|
for (int i = 0; i < vars.length; i++) {
|
||||||
if (vars[i].getFullName().equals(name)
|
if (vars[i].getFullName().equals(v.getFullName())
|
||||||
|
&& vars[i].getName().equals(v.getName()) // see bug #113364
|
||||||
&& vars[i].getCastingArrayStart() == v.getCastingArrayStart()
|
&& vars[i].getCastingArrayStart() == v.getCastingArrayStart()
|
||||||
&& vars[i].getCastingArrayEnd() == v.getCastingArrayEnd()
|
&& vars[i].getCastingArrayEnd() == v.getCastingArrayEnd()
|
||||||
&& VariableDescriptor.equalsCasting(vars[i], v)) {
|
&& VariableDescriptor.equalsCasting(vars[i], v)) {
|
||||||
|
|
|
@ -351,6 +351,7 @@ public abstract class VariableDescriptor extends CObject implements ICDIVariable
|
||||||
if (varDesc instanceof VariableDescriptor) {
|
if (varDesc instanceof VariableDescriptor) {
|
||||||
VariableDescriptor desc = (VariableDescriptor) varDesc;
|
VariableDescriptor desc = (VariableDescriptor) varDesc;
|
||||||
if (desc.getFullName().equals(getFullName())
|
if (desc.getFullName().equals(getFullName())
|
||||||
|
&& desc.getName().equals(getName()) // see bug #113364
|
||||||
&& desc.getCastingArrayStart() == getCastingArrayStart()
|
&& desc.getCastingArrayStart() == getCastingArrayStart()
|
||||||
&& desc.getCastingArrayEnd() == getCastingArrayEnd()
|
&& desc.getCastingArrayEnd() == getCastingArrayEnd()
|
||||||
&& equalsCasting(desc, this)) {
|
&& equalsCasting(desc, this)) {
|
||||||
|
|
Loading…
Add table
Reference in a new issue