mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-26 14:15:32 +00:00
Apparently deques aren't so cool.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36709 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
5ef35803e4
commit
7e33edc3c3
@ -451,7 +451,7 @@ docstring Counters::theCounter(docstring const & counter,
|
||||
if (smit != sm.end())
|
||||
return counterLabel(smit->second, lang);
|
||||
|
||||
deque<docstring> callers;
|
||||
vector<docstring> callers;
|
||||
docstring const & fls = flattenLabelString(counter, appendix(),
|
||||
lang, callers);
|
||||
sm[lang] = fls;
|
||||
@ -462,7 +462,7 @@ docstring Counters::theCounter(docstring const & counter,
|
||||
docstring Counters::flattenLabelString(docstring const & counter,
|
||||
bool in_appendix,
|
||||
string const & lang,
|
||||
deque<docstring> & callers) const
|
||||
vector<docstring> & callers) const
|
||||
{
|
||||
docstring label;
|
||||
|
||||
|
@ -20,7 +20,7 @@
|
||||
#include "support/docstring.h"
|
||||
|
||||
#include <map>
|
||||
#include <deque>
|
||||
#include <vector>
|
||||
|
||||
|
||||
namespace lyx {
|
||||
@ -188,7 +188,7 @@ private:
|
||||
*/
|
||||
docstring flattenLabelString(docstring const & counter, bool in_appendix,
|
||||
std::string const &lang,
|
||||
std::deque<docstring> & callers) const;
|
||||
std::vector<docstring> & callers) const;
|
||||
/// Returns the value of the counter according to the
|
||||
/// numbering scheme numbertype.
|
||||
/** Available numbering schemes are arabic (1, 2,...), roman
|
||||
@ -213,9 +213,9 @@ private:
|
||||
/// Are we in a subfloat?
|
||||
bool subfloat_;
|
||||
/// Used to keep track of active counters.
|
||||
std::deque<docstring> counter_stack_;
|
||||
std::vector<docstring> counter_stack_;
|
||||
/// Same, but for last layout.
|
||||
std::deque<Layout const *> layout_stack_;
|
||||
std::vector<Layout const *> layout_stack_;
|
||||
};
|
||||
|
||||
} // namespace lyx
|
||||
|
Loading…
Reference in New Issue
Block a user