From 1cf398c94c1957961a7a4b8fd59f43e554016bf7 Mon Sep 17 00:00:00 2001
From: Henrik Rydberg <rydberg@euromail.se>
Date: Fri, 18 May 2012 08:59:28 +0200
Subject: Fix compilation on gcc 4.7

Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
---
 src/mt/mvec.h   | 10 +++++-----
 src/net/test.cc |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/mt/mvec.h b/src/mt/mvec.h
index 9f31c1e..412f3d7 100644
--- a/src/mt/mvec.h
+++ b/src/mt/mvec.h
@@ -78,16 +78,16 @@ public:
     int pos=it-map; ins(pos+1,-1); return map+pos;
   }
 
-  void push_back(const T& s) { reserve(dim+1); map[dim++]=s; }
-  void pop_back(const T& s) { if(dim) --dim; }
-  
   ////////////////////////////////////////////////////////////////
   
   void reserve(int n) {
     if(caps<n) { while(caps<n) caps<<=1; map=(T*)realloc(map,caps*sizeof(T)); }
   }
   void resize(int n) { reserve(n); dim=n; }
-  
+
+  void push_back(const T& s) { reserve(dim+1); map[dim++]=s; }
+  void pop_back(const T& s) { if(dim) --dim; }
+
   ////////////////////////////////////////////////////////////////
 
 protected:
@@ -130,7 +130,7 @@ public:
     it->~T(); int pos=it-map; mrvec<T>::ins(pos+1,-1); return map+pos;
   }
 
-  void push_back(const T& s) { reserve(dim+1); new(map+dim++) T(s); }
+  void push_back(const T& s) { mrvec<T>::reserve(dim+1); new(map+dim++) T(s); }
   void pop_back(const T& s) { if(dim) map[--dim].~T(); }
 
   ////////////////////////////////////////////////////////////////
diff --git a/src/net/test.cc b/src/net/test.cc
index c0e3b41..cb7e46d 100644
--- a/src/net/test.cc
+++ b/src/net/test.cc
@@ -18,6 +18,7 @@
  */
 
 #include <mt/mlock.h>
+#include <unistd.h>
 #include <iostream>
 using namespace std;
 
-- 
cgit v1.2.3