Miscellaneous fixes

diff --git a/source/core/thread_private.h b/source/core/thread_private.h
index f64c582c6e17a0bfa6760ec36c5618cbd8c8761d..3c3b341565d4b1dcd12e085d6a4506d9b2ee74de 100644 (file)
--- 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 e7d7f58596e94d3eba13cfc5db65ed28032c7530..26afeefc4300e0955b52ca72931c1c2b63eb0d16 100644 (file)
--- 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 410141cfb9e82626f957e6aecf6ee2fbbfc936ad..7c436183d4f279cdc2a034053041fb5c5b96ad1d 100644 (file)
--- 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 b8423c927f1daa95dd517c961e83c3477cf42731..16d6d8254e78b111aeff6c9e541b2e866cadf667 100644 (file)
--- 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 67157c9b185e434adf995ec75eeb3f122869ea9a..6122fe40c557c9716cca6e88e7b2926408ad29ef 100644 (file)
--- 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)