From 7311b71b370d0f2bf87722baac0fa095583db93a Mon Sep 17 00:00:00 2001
From: Vladimir Ermakov <vooon341@gmail.com>
Date: Fri, 1 Aug 2014 21:37:41 +0400
Subject: [PATCH] mavconn: Cleanup boost threads.

I will use C++11 standard libs.
Issue #72.
---
 include/mavros/mavconn_interface.h | 8 ++------
 include/mavros/mavros_uas.h        | 3 +++
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/include/mavros/mavconn_interface.h b/include/mavros/mavconn_interface.h
index 849629d1e..1ff7021de 100644
--- a/include/mavros/mavconn_interface.h
+++ b/include/mavros/mavconn_interface.h
@@ -34,15 +34,11 @@
 #include <boost/signals2.hpp>
 #include <boost/system/system_error.hpp>
 
-// cleanup @{
-#include <boost/thread/thread.hpp>
-#include <boost/thread/recursive_mutex.hpp>
-// @}
-
 #include <set>
 #include <mutex>
 #include <thread>
 #include <memory>
+#include <sstream>
 #include <mavros/mavconn_mavlink.h>
 
 namespace mavconn {
@@ -60,7 +56,7 @@ class DeviceError : public std::exception {
 	 * @breif Construct error with description.
 	 */
 	explicit DeviceError(const char *module, const char *description) {
-		std::stringstream ss;
+		std::ostringstream ss;
 		ss << "DeviceError:" << module << ": " << description;
 		e_what_ = ss.str();
 	}
diff --git a/include/mavros/mavros_uas.h b/include/mavros/mavros_uas.h
index 9ad119c77..408c352b7 100644
--- a/include/mavros/mavros_uas.h
+++ b/include/mavros/mavros_uas.h
@@ -29,6 +29,9 @@
 #include <tf/transform_datatypes.h>
 #include <mavros/mavconn_interface.h>
 
+// TODO: replace with C++11
+#include <boost/thread/recursive_mutex.hpp>
+
 namespace mavplugin {
 
 /**