OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

DuneMatrix: remove hackery of defining private as protected. This issues has been

Browse Source 
resolved in dune-2.4.
This commit is contained in:
Robert Kloefkorn 2015-08-07 12:08:06 +02:00
parent b58aafe896
commit 9cf207f1fb
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
opm/autodiff/DuneMatrix.hpp
View File

@ -33,10 +33,14 @@
#include <dune/common/fmatrix.hh>
#include <dune/common/version.hh>
#if DUNE_VERSION_NEWER(DUNE_ISTL,2,4)
#include <dune/istl/bcrsmatrix.hh>
#else
// Include matrix header with hackery to make it possible to inherit.
#define private protected
#include <dune/istl/bcrsmatrix.hh>
#undef private
#endif
#include <opm/core/utility/platform_dependent/reenable_warnings.h>
@ -82,7 +86,7 @@ namespace Opm
this->overflowsize = -1.0;
#endif
// make sure to use the allocators of this matrix
// make sure to use the allocators of this matrix
// because the same allocators are used to deallocate the data
this->a = this->allocator_.allocate(this->nnz);
static_assert(sizeof(block_type) == sizeof(double), "This constructor requires a block type that is the same as a double.");