From 44f29eb4f7d5183d4e1ede49a6387493f8e0998b Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Tue, 1 Sep 2020 15:24:33 +0200 Subject: [PATCH] add explicit copy-constructors implicitly generated copy constructors are deprecated in C++11, if the class already has an assignment operator. quells warnings with modern gcc/clang. --- opm/parser/eclipse/EclipseState/Tables/TableColumn.hpp | 2 ++ opm/parser/eclipse/EclipseState/Tables/TableManager.hpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/opm/parser/eclipse/EclipseState/Tables/TableColumn.hpp b/opm/parser/eclipse/EclipseState/Tables/TableColumn.hpp index ee2e41778..a9214e88f 100644 --- a/opm/parser/eclipse/EclipseState/Tables/TableColumn.hpp +++ b/opm/parser/eclipse/EclipseState/Tables/TableColumn.hpp @@ -34,6 +34,8 @@ namespace Opm { TableColumn(); explicit TableColumn( const ColumnSchema& schema ); + TableColumn(const TableColumn& c2) { *this = c2; } + static TableColumn serializeObject(); size_t size( ) const; diff --git a/opm/parser/eclipse/EclipseState/Tables/TableManager.hpp b/opm/parser/eclipse/EclipseState/Tables/TableManager.hpp index bd4c32243..10321614d 100644 --- a/opm/parser/eclipse/EclipseState/Tables/TableManager.hpp +++ b/opm/parser/eclipse/EclipseState/Tables/TableManager.hpp @@ -69,6 +69,8 @@ namespace Opm { explicit TableManager( const Deck& deck ); TableManager() = default; + TableManager(const TableManager& t2) { *this = t2; } + static TableManager serializeObject(); TableManager& operator=(const TableManager& data);