From eba2ad612cc25fcfcd7347f360b5506ba8921835 Mon Sep 17 00:00:00 2001
From: Jasmin Jessich <jasmin@anw.at>
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".
---
live.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
(limited to 'live.cpp')
diff --git a/live.cpp b/live.cpp
index 234e66a..232965a 100644
--- a/live.cpp
+++ b/live.cpp
@@ -4,6 +4,9 @@
* See the README file for copyright information and how to reach the author.
*/
+// To get rid of the swap definition in vdr/tools.h
+#define __STL_CONFIG_H
+
#include <vdr/config.h>
#include <vdr/plugin.h>
#include "i18n.h"
@@ -18,8 +21,6 @@
namespace vdrlive {
-using namespace std;
-
const char *Plugin::VERSION = LIVEVERSION;
const char *Plugin::DESCRIPTION = LIVESUMMARY;
--
cgit v1.2.3