From b537410dcd5b7e661625b51ee72b15e40045fd18 Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Fri, 24 May 2013 17:45:49 +0300
Subject: [PATCH] Miscellaneous fixes

---
 source/core/thread_private.h   | 1 +
 source/core/unix/thread.cpp    | 2 --
 source/core/windows/thread.cpp | 2 --
 source/io/eventobject.h        | 2 +-
 source/strings/regex.cpp       | 4 ++--
 5 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/source/core/thread_private.h b/source/core/thread_private.h
index f64c582..3c3b341 100644
--- a/source/core/thread_private.h
+++ b/source/core/thread_private.h
@@ -1,6 +1,7 @@
 #ifndef MSP_CORE_THREAD_PRIVATE_H_
 #define MSP_CORE_THREAD_PRIVATE_H_
 
+#include "thread.h"
 #include "thread_platform.h"
 
 namespace Msp {
diff --git a/source/core/unix/thread.cpp b/source/core/unix/thread.cpp
index e7d7f58..26afeef 100644
--- a/source/core/unix/thread.cpp
+++ b/source/core/unix/thread.cpp
@@ -3,8 +3,6 @@
 #include "thread.h"
 #include "thread_private.h"
 
-using namespace std;
-
 namespace Msp {
 
 void Thread::platform_join()
diff --git a/source/core/windows/thread.cpp b/source/core/windows/thread.cpp
index 410141c..7c43618 100644
--- a/source/core/windows/thread.cpp
+++ b/source/core/windows/thread.cpp
@@ -2,8 +2,6 @@
 #include "thread.h"
 #include "thread_private.h"
 
-using namespace std;
-
 namespace Msp {
 
 void Thread::platform_join()
diff --git a/source/io/eventobject.h b/source/io/eventobject.h
index b8423c9..16d6d82 100644
--- a/source/io/eventobject.h
+++ b/source/io/eventobject.h
@@ -6,7 +6,7 @@
 namespace Msp {
 namespace IO {
 
-struct Handle;
+class Handle;
 
 /**
 Interface class for objects that can provide event-based I/O.  These objects
diff --git a/source/strings/regex.cpp b/source/strings/regex.cpp
index 67157c9..6122fe4 100644
--- a/source/strings/regex.cpp
+++ b/source/strings/regex.cpp
@@ -10,7 +10,7 @@ namespace {
 
 /** Writes an integer to a Regex code string, in little-endian order. */
 template<typename T>
-void write_int(T n, Msp::Regex::Code &code)
+void write_int(T n, basic_string<unsigned char> &code)
 {
 	for(unsigned i=0; i<sizeof(T); ++i)
 		code += (n>>(i*8))&0xFF;
@@ -18,7 +18,7 @@ void write_int(T n, Msp::Regex::Code &code)
 
 /** Reads an integer from a Regex code string, in little-endian order. */
 template<typename T>
-T read_int(Msp::Regex::Code::const_iterator &c)
+T read_int(basic_string<unsigned char>::const_iterator &c)
 {
 	T result = 0;
 	for(unsigned i=0; i<sizeof(T); ++i)
-- 
2.43.0