Skip to content

Commit 5b5b2e8

Browse files
committed
Fix bad logic (from commit 4b50489)
1 parent 4b50489 commit 5b5b2e8

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

src/fflib/lgfem.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7315,20 +7315,20 @@ E_F0 *Op_CopyArray::code(const basicAC_F0 &args) const {
73157315
int na = a.size( );
73167316
int nb = b.size( );
73177317
if (na != nb) CompileError("Copy of Array with incompatible size!");
7318+
Expression r = 0; // new code FH sep 2009.
7319+
if (!r) r = Op_CopyArrayT< double, v_fes >(a, b);
7320+
if (!r) r = Op_CopyArrayT< Complex, v_fes >(a, b);
7321+
if (!r) r = Op_CopyArrayT< double, v_fes3 >(a, b);
7322+
if (!r) r = Op_CopyArrayT< Complex, v_fes3 >(a, b);
7323+
if (!r) r = Op_CopyArrayT< double, v_fesS >(a, b);
7324+
if (!r) r = Op_CopyArrayT< Complex, v_fesS >(a, b);
7325+
if (!r) r = Op_CopyArrayT< double, v_fesL >(a, b);
7326+
if (!r) r = Op_CopyArrayT< Complex, v_fesL >(a, b);
7327+
if (r) return r;
73187328
else {
7319-
Expression r = 0; // new code FH sep 2009.
7320-
if (!r) r = Op_CopyArrayT< double, v_fes >(a, b);
7321-
if (!r) r = Op_CopyArrayT< Complex, v_fes >(a, b);
7322-
if (!r) r = Op_CopyArrayT< double, v_fes3 >(a, b);
7323-
if (!r) r = Op_CopyArrayT< Complex, v_fes3 >(a, b);
7324-
if (!r) r = Op_CopyArrayT< double, v_fesS >(a, b);
7325-
if (!r) r = Op_CopyArrayT< Complex, v_fesS >(a, b);
7326-
if (!r) r = Op_CopyArrayT< double, v_fesL >(a, b);
7327-
if (!r) r = Op_CopyArrayT< Complex, v_fesL >(a, b);
7328-
if (r) return r;
7329+
CompileError("Internal Error: General Copy of Array : to do ");
7330+
return ret;
73297331
}
7330-
CompileError("Internal Error: General Copy of Array : to do ");
7331-
return ret;
73327332
}
73337333

73347334
template< class v_fes, int DIM >

0 commit comments

Comments
 (0)