mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-05 13:26:21 +00:00
Hacky fix for the boost::tie stuff.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2657 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
c9ca51378a
commit
3a0b382ba7
@ -5,6 +5,9 @@
|
||||
|
||||
2001-09-02 Angus Leeming <a.leeming@ic.ac.uk>
|
||||
|
||||
* buffer.C (getLists): replace boost::tie code with an explicit pair
|
||||
as boost::tie can break some compilers.
|
||||
|
||||
* iterators.h: Added a std:: declaration to the return type of
|
||||
ParIterator::size.
|
||||
|
||||
|
13
src/buffer.C
13
src/buffer.C
@ -32,8 +32,6 @@
|
||||
#include <locale>
|
||||
#endif
|
||||
|
||||
#include <boost/tuple/tuple.hpp>
|
||||
|
||||
#ifdef __GNUG__
|
||||
#pragma implementation
|
||||
#endif
|
||||
@ -3576,10 +3574,21 @@ Buffer::Lists const Buffer::getLists() const
|
||||
{
|
||||
Lists l;
|
||||
Paragraph * par = paragraph;
|
||||
|
||||
#if 1
|
||||
std::pair<bool, LyXTextClassList::size_type> const tmp =
|
||||
textclasslist.NumberOfLayout(params.textclass, "Caption");
|
||||
bool const found = tmp.first;
|
||||
LyXTextClassList::size_type const cap = tmp.second;
|
||||
|
||||
#else
|
||||
// This is the prefered way to to this, but boost::tie can break
|
||||
// some compilers
|
||||
bool found;
|
||||
LyXTextClassList::size_type cap;
|
||||
boost::tie(found, cap) = textclasslist
|
||||
.NumberOfLayout(params.textclass, "Caption");
|
||||
#endif
|
||||
|
||||
while (par) {
|
||||
char const labeltype =
|
||||
|
Loading…
Reference in New Issue
Block a user