Commits

Anonymous committed 9e35a9f Merge

Merge pull request #2 from ronchaine/master

fix Linux build

Comments (0)

Files changed (3)

include/kNet/NetworkSimulator.h

 #include "PolledTimer.h"
 #include <vector>
 
+#include <cstring>
+
 namespace kNet
 {
 

src/qt/GraphDialog.cpp

 #include <QTreeWidget>
 #include <QPainter>
 #include <sstream>
+#include <algorithm>
 
 #ifdef KNET_USE_BOOST
 #include <boost/thread/thread.hpp>
 		{
 			StatsEvent *e = node.events.ItemAt(i);
 			if (Clock::IsNewer(e->time, leftX) && Clock::IsNewer(rightX, e->time))
-				maxY = max(maxY, e->value);
+				maxY = std::max(maxY, e->value);
 		}
 
 		painter.setPen(QPen(QColor(0,0,0)));

src/qt/NetworkDialog.cpp

 		}
 		else
 		{
-			iter = graphs.erase(iter);
+         GraphMap::iterator next = iter;
+			graphs.erase(iter);
+         iter = next;
 		}
 	}
 }