From d1127293cd893a586d6e79bec266b0faa3ad5f9b 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

---
 drain/Algo.h              | 12 +++---------
 drain/EndPointCallback.h  |  7 +------
 drain/EndPointWrite.h     |  9 ++-------
 drain/IOFormatInterface.h | 12 +++---------
 drain/Process.h           |  9 ++-------
 drain/Resampler.h         |  6 +-----
 drain/Volume.h            |  6 +-----
 drain/airtalgo.h          |  6 +-----
 8 files changed, 14 insertions(+), 53 deletions(-)

diff --git a/drain/Algo.h b/drain/Algo.h
index 2c9fe5e..eaa70da 100644
--- a/drain/Algo.h
+++ b/drain/Algo.h
@@ -13,15 +13,9 @@
 #include <stdint.h>
 #include <audio/format.h>
 #include <audio/channel.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 "AutoLogInOut.h"
 #include "IOFormatInterface.h"
 #include "debug.h"
diff --git a/drain/EndPointCallback.h b/drain/EndPointCallback.h
index ad3b984..ac13bea 100644
--- a/drain/EndPointCallback.h
+++ b/drain/EndPointCallback.h
@@ -8,12 +8,7 @@
 #define __AIRT_ALGO_END_POINT_CALLBACK_H__
 
 #include <drain/EndPoint.h>
-#if __cplusplus >= 201103L
-	#include <functional>
-#else
-	#include <etk/functional.h>
-#endif
-
+#include <etk/functional.h>
 
 namespace drain {
 	typedef std11::function<void (void* _data,
diff --git a/drain/EndPointWrite.h b/drain/EndPointWrite.h
index aaa0f64..dbca436 100644
--- a/drain/EndPointWrite.h
+++ b/drain/EndPointWrite.h
@@ -8,13 +8,8 @@
 #define __AIRT_ALGO_ALGO_END_POINT_WRITE_H__
 
 #include <drain/EndPoint.h>
-#if __cplusplus >= 201103L
-	#include <functional>
-	#include <mutex>
-#else
-	#include <etk/functional.h>
-	#include <etk/mutex.h>
-#endif
+#include <etk/functional.h>
+#include <etk/mutex.h>
 
 namespace drain{
 	typedef std11::function<void (const std11::chrono::system_clock::time_point& _time,
diff --git a/drain/IOFormatInterface.h b/drain/IOFormatInterface.h
index f716089..4099377 100644
--- a/drain/IOFormatInterface.h
+++ b/drain/IOFormatInterface.h
@@ -13,15 +13,9 @@
 #include <stdint.h>
 #include <audio/format.h>
 #include <audio/channel.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 "AutoLogInOut.h"
 #include "debug.h"
 
diff --git a/drain/Process.h b/drain/Process.h
index 5114c4f..a5577ae 100644
--- a/drain/Process.h
+++ b/drain/Process.h
@@ -14,13 +14,8 @@
 #include <audio/format.h>
 #include <audio/channel.h>
 #include <drain/Algo.h>
-#if __cplusplus >= 201103L
-	#include <memory>
-	#include <chrono>
-#else
-	#include <etk/chrono.h>
-	#include <etk/memory.h>
-#endif
+#include <etk/chrono.h>
+#include <etk/memory.h>
 
 namespace drain{
 	class Process {
diff --git a/drain/Resampler.h b/drain/Resampler.h
index d21d254..bae501c 100644
--- a/drain/Resampler.h
+++ b/drain/Resampler.h
@@ -11,11 +11,7 @@
 #ifdef HAVE_SPEEX_DSP_RESAMPLE
 	#include <speex/speex_resampler.h>
 #endif
-#if __cplusplus >= 201103L
-	#include <memory>
-#else
-	#include <etk/memory.h>
-#endif
+#include <etk/memory.h>
 
 namespace drain {
 	// TODO: Manage change timestamp when pull mode
diff --git a/drain/Volume.h b/drain/Volume.h
index f252dd3..48b3c24 100644
--- a/drain/Volume.h
+++ b/drain/Volume.h
@@ -11,11 +11,7 @@
 #ifdef HAVE_SPEEX_DSP_RESAMPLE
 	#include <speex/speex_resampler.h>
 #endif
-#if __cplusplus >= 201103L
-	#include <memory>
-#else
-	#include <etk/memory.h>
-#endif
+#include <etk/memory.h>
 
 namespace drain {
 	// data structure.
diff --git a/drain/airtalgo.h b/drain/airtalgo.h
index 20b1dae..8541204 100644
--- a/drain/airtalgo.h
+++ b/drain/airtalgo.h
@@ -10,11 +10,7 @@
 #include <string>
 #include <audio/format.h>
 #include <drain/channel.h>
-#if __cplusplus >= 201103L
-	#include <chrono>
-#else
-	#include <etk/chrono.h>
-#endif
+#include <etk/chrono.h>
 
 namespace drain {
 	/**