mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-09 18:31:04 +00:00
cosmetics
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21838 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
7c108afd14
commit
31ea0bb04d
@ -21,10 +21,7 @@
|
||||
|
||||
#include <boost/assert.hpp>
|
||||
|
||||
using std::abs;
|
||||
using std::endl;
|
||||
using std::string;
|
||||
using std::max;
|
||||
#include <ostream>
|
||||
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user