From eba2ad612cc25fcfcd7347f360b5506ba8921835 Mon Sep 17 00:00:00 2001 From: Jasmin Jessich Date: Fri, 19 May 2017 20:31:08 +0200 Subject: gcc-6 fixes - New file autoptr.h to switch between "std::unique_ptr" and "std::auto_ptr" depending on the GCC version, by new macro AUTO_PTR. - Removed some "using namespace std" and add some "#define __STL_CONFIG_H" before including header files. This will not define "swap" in vdr/tools.h. - Remove also "using namespace std::tr1". --- thread.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'thread.h') diff --git a/thread.h b/thread.h index ee1c764..10f873a 100644 --- a/thread.h +++ b/thread.h @@ -3,6 +3,8 @@ #include #include +#include "autoptr.h" + namespace tnt { class Tntnet; } @@ -19,7 +21,7 @@ protected: virtual void Action(); private: - std::auto_ptr< tnt::Tntnet > m_server; + AUTO_PTR< tnt::Tntnet > m_server; }; } // namespace vdrlive -- cgit v1.2.3