* GuiToolbar.cpp:

[lyx.git] / src / Changes.cpp

diff --git a/src/Changes.cpp b/src/Changes.cpp
index 06e7cd51ea8d6179ccce015859ad2dc9a6aa1240..7b711172ecaa84aaf4fd97c551495aa7120386b2 100644 (file)
--- a/src/Changes.cpp
+++ b/src/Changes.cpp
@@ -14,17 +14,17 @@
 #include <config.h>
 
 #include "Changes.h"
-#include "debug.h"
 #include "Author.h"
 #include "BufferParams.h"
 #include "LaTeXFeatures.h"
 
-#include <boost/assert.hpp>
+#include "support/debug.h"
 
-using std::abs;
-using std::endl;
-using std::string;
-using std::max;
+#include "support/lassert.h"
+
+#include <ostream>
+
+using namespace std;
 
 namespace lyx {
 
@@ -98,7 +98,8 @@ void Changes::set(Change const & change, pos_type const start, pos_type const en
 {
        if (change.type != Change::UNCHANGED) {
                LYXERR(Debug::CHANGES, "setting change (type: " << change.type
-                       << ", author: " << change.author << ", time: " << change.changetime
+                       << ", author: " << change.author 
+                       << ", time: " << long(change.changetime)
                        << ") in range (" << start << ", " << end << ")");
        }
 
@@ -319,7 +320,7 @@ int Changes::latexMarkChange(odocstream & os, BufferParams const & bparams,
 }
 
 
-void Changes::lyxMarkChange(std::ostream & os, int & column,
+void Changes::lyxMarkChange(ostream & os, int & column,
                            Change const & old, Change const & change)
 {
        if (old == change)