pcpa pushed to Singular (master). "Rewrite gcc5 patch"

[notifications at fedoraproject.org]

>From 07a44ac79b26ca3765f94bc2b217b24ccd60da50 Mon Sep 17 00:00:00 2001
From: pcpa <paulo.cesar.pereira.de.andrade at gmail.com>
Date: Thu, 2 Apr 2015 14:16:47 -0300
Subject: Rewrite gcc5 patch


diff --git a/Singular-gcc5.patch b/Singular-gcc5.patch
index 5e395d2..e80f87e 100644
--- a/Singular-gcc5.patch
+++ b/Singular-gcc5.patch
@@ -1,21 +1,31 @@
 diff -up Singular-3-1-6/Singular/Minor.cc.orig Singular-3-1-6/Singular/Minor.cc
---- Singular-3-1-6/Singular/Minor.cc.orig	2015-03-28 20:41:36.396539843 -0300
-+++ Singular-3-1-6/Singular/Minor.cc	2015-03-28 20:42:33.458542028 -0300
-@@ -799,7 +802,7 @@ string MinorKey::toString() const
+--- Singular-3-1-6/Singular/Minor.cc.orig	2015-04-02 14:14:42.476181663 -0300
++++ Singular-3-1-6/Singular/Minor.cc	2015-04-02 14:15:29.714183472 -0300
+@@ -799,11 +799,11 @@ string MinorKey::toString() const
      z = this->getRowKey(r);
      while (z != 0)
      {
 -      if ((z % 2) != 0) t = "1" + t; else t = "0" + t;
-+      if ((z % 2) != 0) t = string("1") + t; else t = string("0") + t;
++      t.insert(t.begin(), (z % 2) ? '1' : '0');
        z = z / 2;
      }
      if (r < this->getNumberOfRowBlocks() - 1)
-@@ -813,7 +816,7 @@ string MinorKey::toString() const
+-      t = string(32 - t.length(), '0') + t;
++      t.insert(0, 32 - t.length(), '0');
+     s += t;
+   }
+   s += ", ";
+@@ -813,11 +813,11 @@ string MinorKey::toString() const
      z = this->getColumnKey(c);
      while (z != 0)
      {
 -      if ((z % 2) != 0) t = "1" + t; else t = "0" + t;
-+      if ((z % 2) != 0) t = string("1") + t; else t = string("0") + t;
++      t.insert(t.begin(), (z % 2) ? '1' : '0');
        z = z / 2;
      }
      if (c < this->getNumberOfColumnBlocks() - 1)
+-      t = string(32 - t.length(), '0') + t;
++      t.insert(0, 32 - t.length(), '0');
+     s += t;
+   }
+   s += ")";
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/Singular.git/commit/?h=master&id=07a44ac79b26ca3765f94bc2b217b24ccd60da50