Skip to content

Commit 19e94c2

Browse files
author
Release Manager
committed
gh-40065: patching gfan
This fixes failed build on OSX: ``` [gfan-0.6.2.p1] [spkg-install] In file included from src/gfanlib_zcone.cpp:8: [gfan-0.6.2.p1] [spkg-install] In file included from src/gfanlib_zcone.h:11: [gfan-0.6.2.p1] [spkg-install] src/gfanlib_matrix.h:123:18: error: no member named 'vectormultiply' in 'Matrix<typ>' [gfan-0.6.2.p1] [spkg-install] 123 | ret[i]=a.vectormultiply(b.column(i)); [gfan-0.6.2.p1] [spkg-install] | ~ ^ [gfan-0.6.2.p1] [spkg-install] 1 error generated. [gfan-0.6.2.p1] [spkg-install] make[3]: *** [src/gfanlib_zcone.o] Error 1 ``` @fchapoton already implemented this fix in Singular https://github.com/f chapoton/Singular/commit/d3f73432d73ac0dd041af83cb35301498e9b57d9 ### Boring details this comments out a method ```c++ friend Matrix operator*(const Matrix& a, const Matrix& b) { assert(a.width==b.height); Matrix ret(b.width,a.height); for(int i=0;i<b.width;i++) ret[i]=a.vectormultiply(b.column(i)); return ret.transposed(); } ``` which depends on a method already commented out (that also doesn't parse as valid code) ```c++ /*IntegerVector vectormultiply(IntegerVector const &v)const { assert(v.size()==width); IntegerVector ret(height); for(int i=0;i<height;i++) ret[i]=dot(rows[i],v); return ret; }*/ ``` URL: #40065 Reported by: Edgar Costa Reviewer(s): Frédéric Chapoton
2 parents 6c97889 + faeca56 commit 19e94c2

File tree

3 files changed

+23
-3
lines changed

3 files changed

+23
-3
lines changed

build/pkgs/configure/checksums.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
tarball=configure-VERSION.tar.gz
2-
sha1=ccd2ea260f6193ef117e33345b48cb5ba773144a
3-
sha256=d40b2445b4973363e7f614a279fbdadeb7c977900091d2b6b619238c5073cdcf
2+
sha1=d79951dd1a219bc39b6b9158b51394b96a4a5de1
3+
sha256=2199f2602aea198d7268a67f396433201b4fa6b7bc53423d777077e598053045
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
14e996467f713ae5f7f77357bcbb7753443010b4
1+
e8053e470a5f2e1cceedb0e76df3a57b31440eb2
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
diff --git a/gfanlib/gfanlib_matrix.h b/gfanlib/gfanlib_matrix.h
2+
index cb5c35de8..fa5b82092 100644
3+
--- a/src/gfanlib_matrix.h
4+
+++ b/src/gfanlib_matrix.h
5+
@@ -115,6 +115,7 @@ public:
6+
p[i][j]=s*(q[i][j]);
7+
return p;
8+
}
9+
+ /*
10+
friend Matrix operator*(const Matrix& a, const Matrix& b)
11+
{
12+
assert(a.width==b.height);
13+
@@ -123,6 +124,7 @@ public:
14+
ret[i]=a.vectormultiply(b.column(i));
15+
return ret.transposed();
16+
}
17+
+ */
18+
/* template<class T>
19+
Matrix<T>(const Matrix<T>& c):v(c.size()){
20+
for(int i=0;i<size();i++)v[i]=typ(c[i]);}

0 commit comments

Comments
 (0)