On Sun, Jan 04, 2004 at 06:56:36PM +0200, Lauri Tischler wrote: > There is a great number of warnings like : > config.h:91: warning: `bool cConfig<T>::Load(const char*, bool, bool) [with > T = > cSetupLine]' was hidden > config.h:246: warning: by `bool cSetup::Load(const char*)' The signature of virtual funtion Load() in some sub classes is incompatible to the one in the super class. This patch should fix this. --- ./config.c~ 2004-01-04 21:36:51.000000000 +0100 +++ ./config.c 2004-01-04 21:29:04.000000000 +0100 @@ -325,7 +325,7 @@ free(buffer); } -bool cSetup::Load(const char *FileName) +bool cSetup::Load(const char *FileName, bool, bool) { if (cConfig<cSetupLine>::Load(FileName, true)) { bool result = true; --- ./config.h~ 2004-01-04 21:36:56.000000000 +0100 +++ ./config.h 2004-01-04 21:28:32.000000000 +0100 @@ -243,7 +243,7 @@ int __EndData__; cSetup(void); cSetup& operator= (const cSetup &s); - bool Load(const char *FileName); + bool Load(const char *FileName, bool = false, bool = false); bool Save(void); }; --- ./recording.c~ 2004-01-04 21:37:16.000000000 +0100 +++ ./recording.c 2004-01-04 21:31:39.000000000 +0100 @@ -694,7 +694,7 @@ // --- cMarks ---------------------------------------------------------------- -bool cMarks::Load(const char *RecordingFileName) +bool cMarks::Load(const char *RecordingFileName, bool, bool) { const char *MarksFile = AddDirectory(RecordingFileName, MARKSFILESUFFIX); if (cConfig<cMark>::Load(MarksFile)) { --- ./recording.h~ 2004-01-04 21:37:12.000000000 +0100 +++ ./recording.h 2004-01-04 21:30:58.000000000 +0100 @@ -89,7 +89,7 @@ class cMarks : public cConfig<cMark> { public: - bool Load(const char *RecordingFileName); + bool Load(const char *RecordingFileName, bool = false, bool = false); void Sort(void); cMark *Add(int Position); cMark *Get(int Position); Robert -- Robert Schiele Tel.: +49-621-181-2517 Dipl.-Wirtsch.informatiker mailto:rschiele@uni-mannheim.de
Attachment:
pgp00000.pgp
Description: PGP signature