- fixed compatibility issue with boost 1.52

diff --git a/package/snapper.changes b/package/snapper.changes
index 344ccc2e0c7afde7ca838dda88cc822630d26506..0610494bf2a71d68edd223224cf5806cd6d7abed 100644 (file)
--- 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 dfc06e4d1bbe7deae6b95740e341b6c6b94e206d..21b580fadcf228059f9a0852aebb3d2b9e8d9373 100644 (file)
--- 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 a2c17cd937314cd8aab318ecd97c90e6c585d94f..994a8218ab4b7c2357061f5e286538d81d102415 100644 (file)
--- 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 c48e91881cfa9768ad36c2c834fd9d141f7da118..6e6152dbd630e0bc1334e6ab00f77765652263b5 100644 (file)
--- 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();
     }