From 1ce427433b8f3688e585bbeec8be312a9d5de38b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A5rd=20Skaflestad?= Date: Thu, 28 Aug 2014 15:00:49 +0200 Subject: [PATCH] Move local type tags out of individual tests. This fixes build on GCC 4.4. --- tests/test_compressedpropertyaccess.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/tests/test_compressedpropertyaccess.cpp b/tests/test_compressedpropertyaccess.cpp index 3b635510..8836de4d 100644 --- a/tests/test_compressedpropertyaccess.cpp +++ b/tests/test_compressedpropertyaccess.cpp @@ -241,14 +241,14 @@ BOOST_FIXTURE_TEST_CASE(CAExtractIntUndefinedAny, // Construct compressed integer (int) array based on global, fully // specified array extracted from input deck. Custom type-check tag. +struct RegionID : public Opm::GridPropertyAccess::Tag::Any {}; + BOOST_FIXTURE_TEST_CASE(CAExtractIntDefinedCustom, TestFixture) { typedef Opm::GridPropertyAccess::ArrayPolicy ::ExtractFromDeck ECLGlobalIntArray; - struct RegionID : public Opm::GridPropertyAccess::Tag::Any {}; - typedef Opm::GridPropertyAccess:: Compressed CompressedArray; @@ -283,14 +283,14 @@ BOOST_FIXTURE_TEST_CASE(CAConstantDoubleAny, // Construct compressed double array based on global constant value // for all cells. Custom type-check tag. +struct MyTag : public Opm::GridPropertyAccess::Tag::Any {}; + BOOST_FIXTURE_TEST_CASE(CAConstantDoubleCustom, TestFixture) { typedef Opm::GridPropertyAccess::ArrayPolicy ::Constant ConstantDoubleArray; - struct MyTag : public Opm::GridPropertyAccess::Tag::Any {}; - typedef Opm::GridPropertyAccess:: Compressed CompressedArray; @@ -333,8 +333,6 @@ BOOST_FIXTURE_TEST_CASE(CAConstantIntCustom, typedef Opm::GridPropertyAccess::ArrayPolicy ::Constant ConstantIntArray; - struct MyTag : public Opm::GridPropertyAccess::Tag::Any {}; - typedef Opm::GridPropertyAccess:: Compressed CompressedArray;