From 1fe6380b69b14c3840010aed520aeb2e946219a5 Mon Sep 17 00:00:00 2001
From: horchi <vdr@jwendel.de>
Date: Mon, 20 Mar 2017 17:55:35 +0100
Subject: 2017-03-20: version 1.1.51 (horchi)\n   - change: Removed compiler
 warnings when using clang\n   - added:  Added clang++ to Make.config (as
 optional compiler)\n   - change: Fixed APIVERSION check for VDR < 2.2.0 (thx
 to nobanzai)\n\n

---
 lib/common.h      | 3 +--
 lib/db.h          | 2 +-
 lib/searchtimer.h | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/common.h b/lib/common.h
index df1c236..28536ec 100644
--- a/lib/common.h
+++ b/lib/common.h
@@ -45,7 +45,6 @@ class MemoryStruct;
   inline long min(long a, long b) { return a < b ? a : b; }
   inline long max(long a, long b) { return a > b ? a : b; }
 #else
-#  define __STL_CONFIG_H
 #  include <vdr/tools.h>
 #endif
 
@@ -133,7 +132,7 @@ int gunzip(MemoryStruct* zippedData, MemoryStruct* unzippedData);
 // MemoryStruct
 //***************************************************************************
 
-struct MemoryStruct
+class MemoryStruct
 {
    public:
 
diff --git a/lib/db.h b/lib/db.h
index e16aeb8..02c9c06 100644
--- a/lib/db.h
+++ b/lib/db.h
@@ -1055,7 +1055,7 @@ class cDbConnection
 
       MYSQL* mysql;
 
-      int initialized;
+      // int initialized;
       int attached;
       int inTact;
       int connectDropped;
diff --git a/lib/searchtimer.h b/lib/searchtimer.h
index ecd3624..c99bc6b 100644
--- a/lib/searchtimer.h
+++ b/lib/searchtimer.h
@@ -65,9 +65,9 @@ class cSearchTimer
       cDbStatement* selectDoneTimer;
       cDbStatement* selectActiveSearchtimers;
       cDbStatement* selectSearchtimerMaxModSp;
-      cDbStatement* selectActiveVdrs;
       cDbStatement* selectAllTimer;
       cDbStatement* selectTimerByEvent;
+      // cDbStatement* selectActiveVdrs;
       // cDbStatement* selectConflictingTimers;
 
       cDbValue startValue;
-- 
cgit v1.2.3