summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Slice/Parser.cpp17
1 files changed, 8 insertions, 9 deletions
diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp
index af6b8e88ffe..04f7b3add7b 100644
--- a/cpp/src/Slice/Parser.cpp
+++ b/cpp/src/Slice/Parser.cpp
@@ -777,9 +777,9 @@ Slice::ClassDef::operations()
p != contents_.end();
++p)
{
- Operation_ptr derived = Operation_ptr::dynamicCast(*p);
- if(derived)
- result.push_back(derived);
+ Operation_ptr q = Operation_ptr::dynamicCast(*p);
+ if(q)
+ result.push_back(q);
}
return result;
}
@@ -790,9 +790,8 @@ Slice::ClassDef::allOperations()
OperationList result = operations();
result.sort();
result.unique();
- ClassList all = allBases();
- for(ClassList::iterator p = all.begin();
- p != all.end();
+ for(ClassList::iterator p = bases_.begin();
+ p != bases_.end();
++p)
{
OperationList li = (*p) -> allOperations();
@@ -810,9 +809,9 @@ Slice::ClassDef::dataMembers()
p != contents_.end();
++p)
{
- DataMember_ptr derived = DataMember_ptr::dynamicCast(*p);
- if(derived)
- result.push_back(derived);
+ DataMember_ptr q = DataMember_ptr::dynamicCast(*p);
+ if(q)
+ result.push_back(q);
}
return result;
}