Merge tag 'upstream/4.0'

Upstream version 4.0

# gpg: Signature made Wed Dec 21 21:25:11 2016 CET
# gpg:                using RSA key 2C7C3146C1A00121
# gpg: Good signature from "Jonas Smedegaard <dr@jones.dk>"
# gpg:                 aka "Jonas Smedegaard <jonas@homebase.dk>"
# gpg:                 aka "Jonas Smedegaard <js@debian.org>"
# gpg:                 aka "[jpeg image of size 4165]"

1 files changed, 4 insertions, 3 deletions

diff --git a/src/main.cpp b/src/main.cpp
index 53f3193..019dff0 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -12,11 +12,12 @@
 
 #include <atomic>
 #include <signal.h>
+#include <litesql.hpp>
 
 // A flag set by the SIGINT signal handler.
-static volatile std::atomic<bool> stop(false);
+static std::atomic<bool> stop(false);
 // Flag set by the SIGUSR1/2 signal handler.
-static volatile std::atomic<bool> reload(false);
+static std::atomic<bool> reload(false);
 // A flag indicating that we are wanting to exit the process. i.e: if this
 // flag is set and all connections are closed, we can exit properly.
 static bool exiting = false;
@@ -84,7 +85,7 @@ int main(int ac, char** av)
 
   try {
       open_database();
-    } catch (...) {
+    } catch (const litesql::DatabaseError&) {
       return 1;
     }