GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-08-17 22:25:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix remaining garbage during a merge.

Browse Source
This commit is contained in:
Gael Guennebaud 2014-09-01 17:25:13 +02:00
parent daad9585a3
commit 8754341848
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
unsupported/Eigen/MPRealSupport
View File

@ -159,11 +159,7 @@ int main()
{ {
if(rows==0 || cols==0 || depth==0) if(rows==0 || cols==0 || depth==0)
return; return;
<<<<<<< local
=======
>>>>>>> other
mpreal acc1(0,mpfr_get_prec(blockA[0].mpfr_srcptr())), mpreal acc1(0,mpfr_get_prec(blockA[0].mpfr_srcptr())),
tmp (0,mpfr_get_prec(blockA[0].mpfr_srcptr())); tmp (0,mpfr_get_prec(blockA[0].mpfr_srcptr()));