From 8fc3c21bd0d2b3030284c3be4656240bff37d667 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Fri, 15 Oct 2010 14:14:51 +0000
Subject: COMMON: Attempt to silence MSVC warning in Common::gcd.

svn-id: r53496
---
 common/algorithm.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'common/algorithm.h')

diff --git a/common/algorithm.h b/common/algorithm.h
index 9d22af4090..67ffe122f9 100644
--- a/common/algorithm.h
+++ b/common/algorithm.h
@@ -242,8 +242,8 @@ void sort(T first, T last) {
  */
 template<class T>
 T gcd(T a, T b) {
-	if (a <= 0) a = -a;
-	if (b <= 0) b = -b;
+	if (a < 0) a = -a;
+	if (b < 0) b = -b;
 	while (a > 0) {
 		T tmp = a;
 		a = b % a;
-- 
cgit v1.2.3


From 5c102d4f082e6e05048cb06e87ff40a17c43207d Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Fri, 15 Oct 2010 14:18:58 +0000
Subject: COMMON: Silence gcc warning introduced with r53496.

svn-id: r53497
---
 common/algorithm.h | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'common/algorithm.h')

diff --git a/common/algorithm.h b/common/algorithm.h
index 67ffe122f9..917fafd639 100644
--- a/common/algorithm.h
+++ b/common/algorithm.h
@@ -242,8 +242,14 @@ void sort(T first, T last) {
  */
 template<class T>
 T gcd(T a, T b) {
+#ifdef _MSC_VER
 	if (a < 0) a = -a;
 	if (b < 0) b = -b;
+#else
+	if (a <= 0) a = -a;
+	if (b <= 0) b = -b;
+#endif
+
 	while (a > 0) {
 		T tmp = a;
 		a = b % a;
-- 
cgit v1.2.3


From 4306a6557769d7d7f42d45b81bd62d4b6a17283c Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Fri, 15 Oct 2010 18:20:01 +0000
Subject: COMMON: Revert attempt to silence MSVC warning in Common::gcd.

svn-id: r53506
---
 common/algorithm.h | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'common/algorithm.h')

diff --git a/common/algorithm.h b/common/algorithm.h
index 917fafd639..b34d6f852d 100644
--- a/common/algorithm.h
+++ b/common/algorithm.h
@@ -242,19 +242,17 @@ void sort(T first, T last) {
  */
 template<class T>
 T gcd(T a, T b) {
-#ifdef _MSC_VER
-	if (a < 0) a = -a;
-	if (b < 0) b = -b;
-#else
-	if (a <= 0) a = -a;
-	if (b <= 0) b = -b;
-#endif
+	if (a <= 0)
+		a = -a;
+	if (b <= 0)
+		b = -b;
 
 	while (a > 0) {
 		T tmp = a;
 		a = b % a;
 		b = tmp;
 	}
+
 	return b;
 }
 
-- 
cgit v1.2.3