summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasmin Jessich <jasmin@anw.at>2017-06-10 18:11:31 +0200
committerJasmin Jessich <jasmin@anw.at>2017-06-10 18:11:31 +0200
commitb86560030911208be738163ecd0e48790c9317a1 (patch)
treeabd0bb8dc7c839b86d7e7064617198f2e3636069
parent688cfedde481fa23a896b72a9b6765c16b2fca88 (diff)
downloadvdr-plugin-live-b86560030911208be738163ecd0e48790c9317a1.tar.gz
vdr-plugin-live-b86560030911208be738163ecd0e48790c9317a1.tar.bz2
Fix compilation with gcc 7.1.0
- Fixed Bug #2466 (https://projects.vdr-developer.org/issues/2466) - Get rid of warning ‘template<class> class std::auto_ptr’ is deprecated by disabling warning deprecated-declarations
-rw-r--r--Makefile3
-rw-r--r--pages/multischedule.ecpp2
2 files changed, 3 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 7ec3524..154fa81 100644
--- a/Makefile
+++ b/Makefile
@@ -51,7 +51,8 @@ ifneq ($(HAVE_LIBPCRECPP),)
LIBS += $(HAVE_LIBPCRECPP)
endif
-CXXFLAGS += -std=c++11 -Wfatal-errors -Wundef
+# -Wno-deprecated-declarations .. get rid of warning: ‘template<class> class std::auto_ptr’ is deprecated
+CXXFLAGS += -std=c++11 -Wfatal-errors -Wundef -Wno-deprecated-declarations
### export all vars for sub-makes, using absolute paths
LIBDIR := $(abspath $(LIBDIR))
diff --git a/pages/multischedule.ecpp b/pages/multischedule.ecpp
index e82942b..d06ac44 100644
--- a/pages/multischedule.ecpp
+++ b/pages/multischedule.ecpp
@@ -317,7 +317,7 @@ std::vector<time_t> times_start;
#endif
if ( ! Channel )
continue;
- if ( Channel->GroupSep() || Channel->Name() == '\0' )
+ if ( Channel->GroupSep() || !Channel->Name() || !*Channel->Name() )
continue;
channel_names[ j ] = Channel->Name();
channel_IDs[ j ] = Channel->GetChannelID();