From: Arvin Schnell <aschnell@suse.de>
Date: Mon, 12 Jan 2015 11:20:05 +0000 (+0100)
Subject: - fixed compilation with clang
X-Git-Tag: v0.2.5~1^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cb0ddfbdafd99062307a88242d3670ecc131945f;p=thirdparty%2Fsnapper.git

- fixed compilation with clang
---

diff --git a/package/snapper.changes b/package/snapper.changes
index 83559257..97fd7bce 100644
--- 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 75769365..8521a444 100644
--- 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 941c18ff..48ed4b11 100644
--- 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
 }