From 5b35ecfe365bdb088d37b5fc881221d7d3d35fc6 Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jf@dockes.org>
Date: Fri, 19 Jan 2018 17:26:43 +0100
Subject: [PATCH] Windows warning suppression (no real changes)

---
 src/common/textsplit.cpp | 2 +-
 src/index/exefetcher.cpp | 2 --
 src/rcldb/rcldb.cpp      | 2 ++
 src/utils/smallut.h      | 2 ++
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/common/textsplit.cpp b/src/common/textsplit.cpp
index 28f91c13..ae85127a 100644
--- a/src/common/textsplit.cpp
+++ b/src/common/textsplit.cpp
@@ -492,7 +492,7 @@ static inline bool isdigit(int what, unsigned int flgs)
 #define STATS_INC_WORDCHARS
 #endif
 
-vector<CharFlags> splitFlags = {
+vector<CharFlags> splitFlags{
     {TextSplit::TXTS_NOSPANS, "nospans"},
     {TextSplit::TXTS_ONLYSPANS, "onlyspans"},
     {TextSplit::TXTS_KEEPWILD, "keepwild"}
diff --git a/src/index/exefetcher.cpp b/src/index/exefetcher.cpp
index ab6feb4c..8dda0208 100644
--- a/src/index/exefetcher.cpp
+++ b/src/index/exefetcher.cpp
@@ -79,8 +79,6 @@ bool EXEDocFetcher::makesig(RclConfig* cnf, const Rcl::Doc& idoc, string& sig)
 // Lookup bckid in the config and create an appropriate fetcher.
 EXEDocFetcher *exeDocFetcherMake(RclConfig *config, const string& bckid)
 {
-    EXEDocFetcher *fetcher = 0;
-
     // The config we only read once, not gonna change.
     static ConfSimple *bconf;
     if (!bconf) {
diff --git a/src/rcldb/rcldb.cpp b/src/rcldb/rcldb.cpp
index 4f35516c..208775cf 100644
--- a/src/rcldb/rcldb.cpp
+++ b/src/rcldb/rcldb.cpp
@@ -753,7 +753,9 @@ Db::~Db()
     LOGDEB("Db::~Db: isopen " << m_ndb->m_isopen << " m_iswritable " <<
            m_ndb->m_iswritable << "\n");
     i_close(true);
+#ifdef RCL_USE_ASPELL
     delete m_aspell;
+#endif
     delete m_config;
 }
 
diff --git a/src/utils/smallut.h b/src/utils/smallut.h
index d159f1f7..1ab958c0 100644
--- a/src/utils/smallut.h
+++ b/src/utils/smallut.h
@@ -227,6 +227,8 @@ private:
 
 /// Entries for the descriptive table
 struct CharFlags {
+    CharFlags(int v, const char *y, const char *n=0)
+        : value(v), yesname(y), noname(n) {}
     unsigned int value; // Flag or value
     const char *yesname;// String to print if flag set or equal
     const char *noname; // String to print if flag not set (unused for values)