[DEV] correct version of CPP

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 {
 	/**

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>

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("---")));
 			}
 		}
 	}

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>

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>

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"

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"

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"

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"

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"