summaryrefslogtreecommitdiff
path: root/live.cpp
diff options
context:
space:
mode:
authorJasmin Jessich <jasmin@anw.at>2017-05-19 20:31:08 +0200
committerJasmin Jessich <jasmin@anw.at>2017-05-20 02:49:29 +0200
commiteba2ad612cc25fcfcd7347f360b5506ba8921835 (patch)
tree5cb0d596e1d7e448856e28921fe83daf70ea86be /live.cpp
parent3aea661f98a0dbf87a4331640ad0408bdb8c4092 (diff)
downloadvdr-plugin-live-eba2ad612cc25fcfcd7347f360b5506ba8921835.tar.gz
vdr-plugin-live-eba2ad612cc25fcfcd7347f360b5506ba8921835.tar.bz2
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".
Diffstat (limited to 'live.cpp')
-rw-r--r--live.cpp5
1 files changed, 3 insertions, 2 deletions
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;