summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2012-01-11 15:41:55 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2012-01-11 15:41:55 +0100
commitde4780fad2335f3e21d03bb044a8fd35faf51b5d (patch)
tree08ec3807b310564ef9c71022c48307b477a028ab
parent875aebe14bc43bbe57473dde229cf739f4d7c26a (diff)
downloadvdr-de4780fad2335f3e21d03bb044a8fd35faf51b5d.tar.gz
vdr-de4780fad2335f3e21d03bb044a8fd35faf51b5d.tar.bz2
Fixed cConfig::Load() for g++ version 4.7.0
-rw-r--r--CONTRIBUTORS1
-rw-r--r--HISTORY1
-rw-r--r--config.h4
3 files changed, 4 insertions, 2 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index e22f321d..b6b3b8c7 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1936,6 +1936,7 @@ Ville Skyttä <ville.skytta@iki.fi>
cSatCableNumbers was wrong
for removing a redundant NULL check in cDvbSpuDecoder::setTime()
for pointing out that the variable HasSnr was unused in cDvbTuner::GetSignalQuality()
+ for fixing cConfig::Load() for g++ version 4.7.0
Steffen Beyer <cpunk@reactor.de>
for fixing setting the colored button help after deleting a recording in case the next
diff --git a/HISTORY b/HISTORY
index 9c308a62..aca4a284 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6811,3 +6811,4 @@ Video Disk Recorder Revision History
Reel).
- Added support for DVB-T2 to libsi (thanks to Rolf Ahrenberg).
- Added support for handling DVB-T2 transponders (thanks to Rolf Ahrenberg).
+- Fixed cConfig::Load() for g++ version 4.7.0 (thanks to Ville Skyttä).
diff --git a/config.h b/config.h
index faa62582..97e6243d 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: config.h 2.37 2011/12/04 21:46:30 kls Exp $
+ * $Id: config.h 2.38 2012/01/11 15:40:47 kls Exp $
*/
#ifndef __CONFIG_H
@@ -122,7 +122,7 @@ public:
if (!isempty(s)) {
T *l = new T;
if (l->Parse(s))
- Add(l);
+ this->Add(l);
else {
esyslog("ERROR: error in %s, line %d", fileName, line);
delete l;