X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FAuthor.cpp;h=79e7de0864b942d059a5ec1502eccb475f17b792;hb=c6e1db7682dc8d58a68147b5eee1d004829ef6d2;hp=12f7137a5f7587a66ee6732dc5ea9351c52c7078;hpb=a756403301ff8fb78df4dc1e131e4cd50cd976e1;p=lyx.git diff --git a/src/Author.cpp b/src/Author.cpp index 12f7137a5f..79e7de0864 100644 --- a/src/Author.cpp +++ b/src/Author.cpp @@ -57,6 +57,7 @@ ostream & operator<<(ostream & os, Author const & a) return os; } + istream & operator>>(istream & is, Author & a) { string s; @@ -69,15 +70,15 @@ istream & operator>>(istream & is, Author & a) } -bool author_smaller(Author const & lhs, Author const & rhs) { +bool author_smaller(Author const & lhs, Author const & rhs) +{ return lhs.bufferId() < rhs.bufferId(); } AuthorList::AuthorList() : last_id_(0) -{ -} +{} int AuthorList::record(Author const & a) @@ -101,8 +102,7 @@ int AuthorList::record(Author const & a) void AuthorList::record(int id, Author const & a) { - LASSERT(unsigned(id) < authors_.size(), /**/); - + LBUFERR(unsigned(id) < authors_.size()); authors_[id] = a; } @@ -116,7 +116,7 @@ void AuthorList::recordCurrentAuthor(Author const & a) Author const & AuthorList::get(int id) const { - LASSERT(id < (int)authors_.size() , /**/); + LASSERT(id < (int)authors_.size() , return authors_[0]); return authors_[id]; } @@ -133,12 +133,14 @@ AuthorList::Authors::const_iterator AuthorList::end() const } -void AuthorList::sort() { +void AuthorList::sort() +{ std::sort(authors_.begin(), authors_.end(), author_smaller); } -ostream & operator<<(ostream & os, AuthorList const & a) { +ostream & operator<<(ostream & os, AuthorList const & a) +{ // Copy the authorlist, because we don't want to sort the original AuthorList sorted = a; sorted.sort();