From 0cce699a98e3cf6897129e13d7657d28bb5388ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= Date: Thu, 22 Dec 2011 14:43:23 +0100 Subject: [PATCH] Stop using std::tr1::array<> since it is padded (alignment) on gcc 4.1 (CentOS 5.7). --- opm/core/fluid/blackoil/BlackoilDefs.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/opm/core/fluid/blackoil/BlackoilDefs.hpp b/opm/core/fluid/blackoil/BlackoilDefs.hpp index fba7546ca..08e44cb83 100644 --- a/opm/core/fluid/blackoil/BlackoilDefs.hpp +++ b/opm/core/fluid/blackoil/BlackoilDefs.hpp @@ -47,9 +47,9 @@ namespace Opm SmallVec() {} SmallVec(const T& elem) - { data_.assign(elem); } // In C++11, assign -> fill + { assign(elem); } SmallVec& operator=(const T& elem) - { data_.assign(elem); return *this; } + { assign(elem); return *this; } const T& operator[](int i) const { return data_[i]; } T& operator[](int i) @@ -62,7 +62,7 @@ namespace Opm } } private: - std::tr1::array data_; + T data_[N]; }; template class SmallMat @@ -71,7 +71,7 @@ namespace Opm SmallMat() {} SmallMat(const T& elem) - { data_.assign(elem); } // In C++11, assign -> fill + { data_.assign(elem); } SmallMat& operator=(const T& elem) { data_.assign(elem); return *this; } typedef SmallVec RowType;