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". --- pages/edit_timer.ecpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'pages') diff --git a/pages/edit_timer.ecpp b/pages/edit_timer.ecpp index 8920b77..ecc8c6e 100644 --- a/pages/edit_timer.ecpp +++ b/pages/edit_timer.ecpp @@ -1,4 +1,8 @@ <%pre> + +// To get rid of the swap definition in vdr/tools.h +#define __STL_CONFIG_H + #include #include #include @@ -14,6 +18,7 @@ #include "livefeatures.h" #include "epgsearch.h" #include "users.h" +#include "autoptr.h" using namespace std; using namespace vdrlive; @@ -106,7 +111,7 @@ cTimer* timer; if (message.empty()) edit_timerreferer = request.getHeader("Referer:", "timers.html"); - auto_ptr< cTimer > eventTimer; + AUTO_PTR< cTimer > eventTimer; if ( timer == 0 && !epgid.empty()) { EpgEvents::DecodeDomId(epgid, channelid, eventid); if ( channelid.Valid() && eventid != 0 ) { -- cgit v1.2.3