- fixed compilation with clang

diff --git a/package/snapper.changes b/package/snapper.changes
index 83559257f010550906c2ad0d1e90cdd76b5d9517..97fd7bcee79684f8fff08ecb4caefb0ce93e4b38 100644 (file)
--- a/package/snapper.changes
+++ b/package/snapper.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jan 12 12:19:30 CET 2015 - aschnell@suse.de
+
+- fixed compilation with clang
+
 -------------------------------------------------------------------
 Mon Dec 15 15:14:39 CET 2014 - aschnell@suse.de
 

diff --git a/server/Client.cc b/server/Client.cc
index 7576936563b9ecc75c353a4d93fb5bf16f3b0756..8521a444a0ac501f98f1e6d912185da11f68fa04 100644 (file)
--- a/server/Client.cc
+++ b/server/Client.cc
@@ -1605,11 +1605,7 @@ Clients::add(const string& name)
 {
     assert(find(name) == entries.end());
 
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)
     entries.emplace_back(name);
-#else
-    entries.push_back(name);
-#endif
 
     return --entries.end();
 }

diff --git a/server/MetaSnapper.cc b/server/MetaSnapper.cc
index 941c18ffa8b05880bcee4997200af60dd8389fb0..48ed4b11aea66df086d437a2c4260408b0dcdbb1 100644 (file)
--- a/server/MetaSnapper.cc
+++ b/server/MetaSnapper.cc
@@ -205,11 +205,7 @@ MetaSnappers::init()
 
     for (list<ConfigInfo>::iterator it = config_infos.begin(); it != config_infos.end(); ++it)
     {
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)
        entries.emplace_back(*it);
-#else
-       entries.push_back(*it);
-#endif
     }
 }
 
@@ -233,11 +229,7 @@ MetaSnappers::createConfig(const string& config_name, const string& subvolume,
 
     ConfigInfo config_info = Snapper::getConfig(config_name);
 
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)
     entries.emplace_back(config_info);
-#else
-    entries.push_back(config_info);
-#endif
 }