From: Arvin Schnell <aschnell@suse.de>
Date: Wed, 6 Feb 2013 09:30:58 +0000 (+0100)
Subject: - fixed compatibility issue with boost 1.52
X-Git-Tag: v0.1.3~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f8d1700cc39d723550b80dac8c72c844d5dd911a;p=thirdparty%2Fsnapper.git

- fixed compatibility issue with boost 1.52
---

diff --git a/package/snapper.changes b/package/snapper.changes
index 344ccc2e..0610494b 100644
--- a/package/snapper.changes
+++ b/package/snapper.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Feb 06 10:27:57 CET 2013 - aschnell@suse.de
+
+- fixed compatibility issue with boost 1.52
+
 -------------------------------------------------------------------
 Mon Feb 04 14:00:45 CET 2013 - aschnell@suse.de
 
diff --git a/server/Background.cc b/server/Background.cc
index dfc06e4d..21b580fa 100644
--- a/server/Background.cc
+++ b/server/Background.cc
@@ -42,7 +42,8 @@ Backgrounds::Backgrounds()
 Backgrounds::~Backgrounds()
 {
     thread.interrupt();
-    thread.join();
+    if (thread.joinable())
+	thread.join();
 }
 
 
diff --git a/server/Client.cc b/server/Client.cc
index a2c17cd9..994a8218 100644
--- a/server/Client.cc
+++ b/server/Client.cc
@@ -46,7 +46,8 @@ Client::Client(const string& name)
 Client::~Client()
 {
     thread.interrupt();
-    thread.join();
+    if (thread.joinable())
+	thread.join();
 
     for (list<Comparison*>::iterator it = comparisons.begin(); it != comparisons.end(); ++it)
     {
diff --git a/server/snapperd.cc b/server/snapperd.cc
index c48e9188..6e6152db 100644
--- a/server/snapperd.cc
+++ b/server/snapperd.cc
@@ -203,7 +203,7 @@ help()
 	 << "\t--debug, -d\t\t\tTurn on debugging." << endl
 	 << endl;
 
-    exit (EXIT_SUCCESS);
+    exit(EXIT_SUCCESS);
 }
 
 
@@ -238,13 +238,13 @@ main(int argc, char** argv)
 		help();
 
 	    default:
-                usage();
+		usage();
 	}
     }
 
     if (optind < argc)
     {
-        cerr << "snapperd: unrecognized option '" << argv[optind] << "'" << endl;
+	cerr << "snapperd: unrecognized option '" << argv[optind] << "'" << endl;
 	usage();
     }