research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow building tests with msvc-12.0.

Browse source 
Fixes the appearance of C2797 (list initialization inside member
initializer list or non-static data member initializer is not
implemented). This was preventing building/running tests with
msvc_version=12.0. It was fixed using Visual Studio 2013 (12.0)
Update 5.
This commit is contained in:
Evan McCorkle 2017-10-18 22:35:49 -04:00 • committed by Ray Speth
parent e921cb89c8
commit 6844e52713
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
test/general/test_matrices.cpp
View file

@ -8,11 +8,11 @@ class BandMatrixTest : public testing::Test
{
public:
BandMatrixTest()
: x{1,2,3,4,5,6}
, b1{-8, -8, 6, 40, 149, 81}
, b2{1, 8, 30, 72, 140, 65}
, v1{3, 13, 28, 55, 100, 92}
, v2{0, 5, 16, 39, 115, 116}
: x(vector_fp{1,2,3,4,5,6})
, b1(vector_fp{-8, -8, 6, 40, 149, 81})
, b2(vector_fp{1, 8, 30, 72, 140, 65})
, v1(vector_fp{3, 13, 28, 55, 100, 92})
, v2(vector_fp{0, 5, 16, 39, 115, 116})
{
A1.resize(6, 1, 2); // one lower, two upper
A2.resize(6, 2, 1); // two lower, one upper
@ -109,11 +109,11 @@ class DenseMatrixTest : public testing::Test
{
public:
DenseMatrixTest()
: x4{1,2,3,4}
, x3{3,2,1}
, b1{14, 32, 66, -34}
, b2{-6, 4, 26, 2}
, b3{14, 32, 66}
: x4(vector_fp{1,2,3,4})
, x3(vector_fp{3,2,1})
, b1(vector_fp{14, 32, 66, -34})
, b2(vector_fp{-6, 4, 26, 2})
, b3(vector_fp{14, 32, 66})
{
A1.resize(4, 4); // square
A2.resize(4, 3); // more rows