From e822d1320915e9de1386a26a7a50d722c15e9f85 Mon Sep 17 00:00:00 2001
From: Edouard DUPIN <yui.heero@gmail.com>
Date: Wed, 25 Feb 2015 22:05:00 +0100
Subject: [PATCH] [DEV] correct version of CPP

---
 river/CircularBuffer.h     |  6 +-----
 river/Interface.h          | 15 ++++-----------
 river/Manager.cpp          |  4 ++--
 river/Manager.h            |  6 +-----
 river/io/Manager.h         | 12 +++---------
 river/io/Node.h            | 13 +++----------
 river/io/NodeAEC.cpp       | 10 ++--------
 river/io/NodeAirTAudio.cpp |  7 +------
 river/io/NodePortAudio.cpp |  7 +------
 test/main.cpp              |  8 +-------
 10 files changed, 19 insertions(+), 69 deletions(-)

diff --git a/river/CircularBuffer.h b/river/CircularBuffer.h
index 3fee6e0..4d5aa0a 100644
--- a/river/CircularBuffer.h
+++ b/river/CircularBuffer.h
@@ -10,11 +10,7 @@
 
 #include <etk/types.h>
 #include <vector>
-#if __cplusplus >= 201103L
-	#include <chrono>
-#else
-	#include <etk/chrono.h>
-#endif
+#include <etk/chrono.h>
 
 namespace river {
 	/**
diff --git a/river/Interface.h b/river/Interface.h
index 8fc0874..fb7e0b6 100644
--- a/river/Interface.h
+++ b/river/Interface.h
@@ -10,17 +10,10 @@
 #include <string>
 #include <vector>
 #include <stdint.h>
-#if __cplusplus >= 201103L
-	#include <mutex>
-	#include <chrono>
-	#include <functional>
-	#include <memory>
-#else
-	#include <etk/mutex.h>
-	#include <etk/chrono.h>
-	#include <etk/functional.h>
-	#include <etk/memory.h>
-#endif
+#include <etk/mutex.h>
+#include <etk/chrono.h>
+#include <etk/functional.h>
+#include <etk/memory.h>
 #include <audio/format.h>
 #include <audio/channel.h>
 #include <drain/Process.h>
diff --git a/river/Manager.cpp b/river/Manager.cpp
index 662e227..7c636f2 100644
--- a/river/Manager.cpp
+++ b/river/Manager.cpp
@@ -60,7 +60,7 @@ std::vector<std::pair<std::string,std::string> > river::Manager::getListStreamIn
 			std::string type = tmppp->getStringValue("io", "error");
 			if (    type == "input"
 			     || type == "feedback") {
-				output.push_back(std::make_pair<std::string,std::string>(keys[iii], std::string("---")));
+				output.push_back(std::make_pair<std::string,std::string>(std::string(keys[iii]), std::string("---")));
 			}
 		}
 	}
@@ -75,7 +75,7 @@ std::vector<std::pair<std::string,std::string> > river::Manager::getListStreamOu
 		if (tmppp != nullptr) {
 			std::string type = tmppp->getStringValue("io", "error");
 			if (type == "output") {
-				output.push_back(std::make_pair<std::string,std::string>(keys[iii], std::string("---")));
+				output.push_back(std::make_pair<std::string,std::string>(std::string(keys[iii]), std::string("---")));
 			}
 		}
 	}
diff --git a/river/Manager.h b/river/Manager.h
index fb28f2e..7833c02 100644
--- a/river/Manager.h
+++ b/river/Manager.h
@@ -9,11 +9,7 @@
 
 #include <string>
 #include <stdint.h>
-#if __cplusplus >= 201103L
-	#include <memory>
-#else
-	#include <etk/memory.h>
-#endif
+#include <etk/memory.h>
 #include <river/Interface.h>
 #include <audio/format.h>
 #include <audio/channel.h>
diff --git a/river/io/Manager.h b/river/io/Manager.h
index 2521fee..7af0224 100644
--- a/river/io/Manager.h
+++ b/river/io/Manager.h
@@ -11,15 +11,9 @@
 #include <vector>
 #include <list>
 #include <stdint.h>
-#if __cplusplus >= 201103L
-	#include <chrono>
-	#include <functional>
-	#include <memory>
-#else
-	#include <etk/chrono.h>
-	#include <etk/functional.h>
-	#include <etk/memory.h>
-#endif
+#include <etk/chrono.h>
+#include <etk/functional.h>
+#include <etk/memory.h>
 #include <audio/format.h>
 #include <audio/channel.h>
 #include <ejson/ejson.h>
diff --git a/river/io/Node.h b/river/io/Node.h
index 1787fcd..7c3d899 100644
--- a/river/io/Node.h
+++ b/river/io/Node.h
@@ -11,16 +11,9 @@
 #include <vector>
 #include <list>
 #include <stdint.h>
-
-#if __cplusplus >= 201103L
-	#include <chrono>
-	#include <functional>
-	#include <memory>
-#else
-	#include <etk/chrono.h>
-	#include <etk/functional.h>
-	#include <etk/memory.h>
-#endif
+#include <etk/chrono.h>
+#include <etk/functional.h>
+#include <etk/memory.h>
 #include <audio/format.h>
 #include <audio/channel.h>
 #include "Manager.h"
diff --git a/river/io/NodeAEC.cpp b/river/io/NodeAEC.cpp
index 3f3f52d..1a83863 100644
--- a/river/io/NodeAEC.cpp
+++ b/river/io/NodeAEC.cpp
@@ -7,14 +7,8 @@
 #include <river/io/NodeAEC.h>
 #include <river/debug.h>
 #include <etk/types.h>
-
-#if __cplusplus >= 201103L
-	#include <memory>
-	#include <functional>
-#else
-	#include <etk/memory.h>
-	#include <etk/functional.h>
-#endif
+#include <etk/memory.h>
+#include <etk/functional.h>
 
 #undef __class__
 #define __class__ "io::NodeAEC"
diff --git a/river/io/NodeAirTAudio.cpp b/river/io/NodeAirTAudio.cpp
index 676e3fd..64d5ff1 100644
--- a/river/io/NodeAirTAudio.cpp
+++ b/river/io/NodeAirTAudio.cpp
@@ -8,12 +8,7 @@
 
 #include <river/io/NodeAirTAudio.h>
 #include <river/debug.h>
-
-#if __cplusplus >= 201103L
-	#include <memory>
-#else
-	#include <etk/memory.h>
-#endif
+#include <etk/memory.h>
 
 #undef __class__
 #define __class__ "io::NodeAirTAudio"
diff --git a/river/io/NodePortAudio.cpp b/river/io/NodePortAudio.cpp
index b313611..fb35812 100644
--- a/river/io/NodePortAudio.cpp
+++ b/river/io/NodePortAudio.cpp
@@ -8,12 +8,7 @@
 
 #include <river/io/NodePortAudio.h>
 #include <river/debug.h>
-
-#if __cplusplus >= 201103L
-	#include <memory>
-#else
-	#include <etk/memory.h>
-#endif
+#include <etk/memory.h>
 
 #undef __class__
 #define __class__ "io::NodePortAudio"
diff --git a/test/main.cpp b/test/main.cpp
index ebe1b24..bed0ca3 100644
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -10,15 +10,9 @@
 #include <gtest/gtest.h>
 #include <etk/os/FSNode.h>
 #include <math.h>
-
 #include <sstream>
 #include <unistd.h>
-
-#if __cplusplus >= 201103L
-	#include <thread>
-#else
-	#include <etk/thread.h>
-#endif
+#include <etk/thread.h>
 
 #undef __class__
 #define __class__ "test"