anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 18:08:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix recursive include check.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39339 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2011-07-18 13:57:15 +00:00
parent 6159350368
commit f49cdf3420
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Buffer.cpp
View File

@ -2640,12 +2640,6 @@ void Buffer::collectChildren(ListOfBuffers & clist, bool grand_children) const
// there might be grandchildren
child->collectChildren(clist, true);
}
// Make sure we have not included ourselves.
ListOfBuffers::iterator bit = find(clist.begin(), clist.end(), this);
if (bit != clist.end()) {
LYXERR0("Recursive include detected in `" << fileName() << "'.");
clist.erase(bit);
}
}
@ -2653,6 +2647,12 @@ ListOfBuffers Buffer::getChildren() const
{
ListOfBuffers v;
collectChildren(v, false);
// Make sure we have not included ourselves.
ListOfBuffers::iterator bit = find(v.begin(), v.end(), this);
if (bit != v.end()) {
LYXERR0("Recursive include detected in `" << fileName() << "'.");
v.erase(bit);
}
return v;
}
@ -2661,6 +2661,12 @@ ListOfBuffers Buffer::getDescendents() const
{
ListOfBuffers v;
collectChildren(v, true);
// Make sure we have not included ourselves.
ListOfBuffers::iterator bit = find(v.begin(), v.end(), this);
if (bit != v.end()) {
LYXERR0("Recursive include detected in `" << fileName() << "'.");
v.erase(bit);
}
return v;
}