X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FAuthor.cpp;h=c2dc6eeb29bed6771c3689ec4b90de08becb4b24;hb=24fe5b08c0e1dfb739738acb6fc995da7315d35f;hp=2a74fe17d190c9107e0367dad6e4083fcea193b8;hpb=f630be890494c849981e4fb52ea4740506e92bed;p=lyx.git diff --git a/src/Author.cpp b/src/Author.cpp index 2a74fe17d1..c2dc6eeb29 100644 --- a/src/Author.cpp +++ b/src/Author.cpp @@ -14,18 +14,15 @@ #include "support/lstrings.h" -#include +#include "support/lassert.h" -#include "support/std_istream.h" +#include +using namespace std; +using namespace lyx::support; namespace lyx { -using support::token; -using support::trim; - -using std::string; - bool operator==(Author const & l, Author const & r) { @@ -33,14 +30,14 @@ bool operator==(Author const & l, Author const & r) } -std::ostream & operator<<(std::ostream & os, Author const & a) +ostream & operator<<(ostream & os, Author const & a) { // FIXME UNICODE os << "\"" << to_utf8(a.name()) << "\" " << to_utf8(a.email()); return os; } -std::istream & operator>>(std::istream & is, Author & a) +istream & operator>>(istream & is, Author & a) { string s; getline(is, s); @@ -74,7 +71,7 @@ int AuthorList::record(Author const & a) void AuthorList::record(int id, Author const & a) { - BOOST_ASSERT(unsigned(id) < authors_.size()); + LASSERT(unsigned(id) < authors_.size(), /**/); authors_[id] = a; } @@ -83,7 +80,7 @@ void AuthorList::record(int id, Author const & a) Author const & AuthorList::get(int id) const { Authors::const_iterator it(authors_.find(id)); - BOOST_ASSERT(it != authors_.end()); + LASSERT(it != authors_.end(), /**/); return it->second; }