From ae02e58b9dc276b247be84e1d708ca50a1f5bbd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?louiz=E2=80=99?= <louiz@louiz.org>
Date: Mon, 31 Oct 2016 13:54:25 +0100
Subject: Some cleanups

---
 src/main.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main.cpp')

diff --git a/src/main.cpp b/src/main.cpp
index 53f3193..5585672 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -14,9 +14,9 @@
 #include <signal.h>
 
 // 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;
-- 
cgit v1.2.3


From e1934a0b5fb1589bcdd85b86b315d652488d0577 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?louiz=E2=80=99?= <louiz@louiz.org>
Date: Tue, 1 Nov 2016 17:38:59 +0100
Subject: Disable e2e tests on openbsd

---
 src/main.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/main.cpp')

diff --git a/src/main.cpp b/src/main.cpp
index 5585672..019dff0 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -12,6 +12,7 @@
 
 #include <atomic>
 #include <signal.h>
+#include <litesql.hpp>
 
 // A flag set by the SIGINT signal handler.
 static std::atomic<bool> stop(false);
@@ -84,7 +85,7 @@ int main(int ac, char** av)
 
   try {
       open_database();
-    } catch (...) {
+    } catch (const litesql::DatabaseError&) {
       return 1;
     }
 
-- 
cgit v1.2.3