summaryrefslogtreecommitdiff
path: root/epgsearch/services.h
diff options
context:
space:
mode:
authorJasmin Jessich <jasmin@anw.at>2017-05-19 18:31:08 (GMT)
committerJasmin Jessich <jasmin@anw.at>2017-05-20 00:49:29 (GMT)
commiteba2ad612cc25fcfcd7347f360b5506ba8921835 (patch)
tree5cb0d596e1d7e448856e28921fe83daf70ea86be /epgsearch/services.h
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 'epgsearch/services.h')
-rw-r--r--epgsearch/services.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/epgsearch/services.h b/epgsearch/services.h
index 35cca9b..e7f80dd 100644
--- a/epgsearch/services.h
+++ b/epgsearch/services.h
@@ -29,6 +29,7 @@ The project's page is at http://winni.vdr-developer.org/epgsearch
#include <memory>
#include <set>
#include <vdr/osdbase.h>
+#include "../autoptr.h"
// Data structure for service "Epgsearch-search-v1.0"
struct Epgsearch_search_v1_0
@@ -157,7 +158,7 @@ class cServiceHandler
struct Epgsearch_services_v1_0
{
// in/out
- std::auto_ptr<cServiceHandler> handler;
+ AUTO_PTR<cServiceHandler> handler;
};
// Data structures for service "Epgsearch-services-v1.1"
@@ -173,7 +174,7 @@ class cServiceHandler_v1_1 : public cServiceHandler
struct Epgsearch_services_v1_1
{
// in/out
- std::auto_ptr<cServiceHandler_v1_1> handler;
+ AUTO_PTR<cServiceHandler_v1_1> handler;
};
// Data structures for service "Epgsearch-services-v1.2"
@@ -189,7 +190,7 @@ class cServiceHandler_v1_2 : public cServiceHandler_v1_1
struct Epgsearch_services_v1_2
{
// in/out
- std::auto_ptr<cServiceHandler_v1_2> handler;
+ AUTO_PTR<cServiceHandler_v1_2> handler;
};
#endif