From 31ea0bb04d42ed8123a8b1ffe28ba8749d8d522b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20P=C3=B6nitz?= Date: Tue, 27 Nov 2007 23:09:06 +0000 Subject: [PATCH] cosmetics git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21838 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/Changes.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/Changes.cpp b/src/Changes.cpp index 06e7cd51ea..8c431a0cc8 100644 --- a/src/Changes.cpp +++ b/src/Changes.cpp @@ -21,10 +21,7 @@ #include -using std::abs; -using std::endl; -using std::string; -using std::max; +#include namespace lyx { @@ -271,7 +268,7 @@ void Changes::merge() << (it + 1)->range.end << ")"); (it + 1)->range.start = it->range.start; - (it + 1)->change.changetime = max(it->change.changetime, + (it + 1)->change.changetime = std::max(it->change.changetime, (it + 1)->change.changetime); table_.erase(it); // start again