Commit 217978d2 authored by snuverink_j's avatar snuverink_j
Browse files

call base class copy constructor in copy constructor

parent 1121acb4
......@@ -136,6 +136,7 @@ namespace {
Column::Column(const Column &rhs):
Scalar<double>(rhs),
itsTable(rhs.itsTable), colName(rhs.colName),
get(rhs.get), ind_1(rhs.ind_1), ind_2(rhs.ind_2)
{}
......
......@@ -129,6 +129,7 @@ namespace {
Column::Column(const Column &rhs):
Expressions::Scalar<double>(rhs),
itsTable(rhs.itsTable), colName(rhs.colName),
get(rhs.get), ind_1(rhs.ind_1), ind_2(rhs.ind_2)
{}
......
......@@ -162,6 +162,7 @@ PartBunch::PartBunch(const PartData *ref):
}
PartBunch::PartBunch(const PartBunch &rhs):
IpplParticleBase<ParticleSpatialLayout<double, 3u> >(rhs),
myNode_m(Ippl::myNode()),
nodes_m(Ippl::getNodes()),
fixed_grid(rhs.fixed_grid),
......
......@@ -66,7 +66,7 @@ public:
inline NullGeometry::NullGeometry()
{}
inline NullGeometry::NullGeometry(const NullGeometry &)
inline NullGeometry::NullGeometry(const NullGeometry & o) : BGeometryBase(o)
{}
inline const NullGeometry &
......
......@@ -37,6 +37,7 @@ OffsetGeometry::OffsetGeometry(const BGeometryBase &g, const Euclid3D &t):
OffsetGeometry::OffsetGeometry(const OffsetGeometry &og):
BGeometryBase(og),
global(og.global), local(og.local), g2l(og.g2l)
{}
......
......@@ -156,7 +156,7 @@ inline PlanarArcGeometry::PlanarArcGeometry(double phi):
inline PlanarArcGeometry::PlanarArcGeometry(const PlanarArcGeometry &rhs):
len(rhs.len), h(rhs.h), angle(rhs.angle)
BGeometryBase(rhs),len(rhs.len), h(rhs.h), angle(rhs.angle)
{}
......
......@@ -38,6 +38,7 @@ SRotatedGeometry::SRotatedGeometry(const BGeometryBase &g,
}
SRotatedGeometry::SRotatedGeometry(const SRotatedGeometry &rhs):
BGeometryBase(rhs),
srotIn(rhs.srotIn), srotOut(rhs.srotOut), geom(rhs.geom)
{}
......
......@@ -109,8 +109,8 @@ private:
inline StraightGeometry::StraightGeometry(double l): len(l)
{}
inline StraightGeometry::StraightGeometry(const StraightGeometry &right)
: len(right.len)
inline StraightGeometry::StraightGeometry(const StraightGeometry &right):
BGeometryBase(right), len(right.len)
{}
inline const StraightGeometry &StraightGeometry::operator=
......
......@@ -72,6 +72,7 @@ inline DirectChannel::DirectChannel(double &value):
inline DirectChannel::DirectChannel(const DirectChannel &rhs):
Channel(),
reference(rhs.reference)
{}
......
......@@ -92,6 +92,7 @@ IndexedChannel<T>::IndexedChannel(T &object, double(T::*get)(int) const,
template <class T>
IndexedChannel<T>::IndexedChannel(const IndexedChannel &rhs):
Channel(),
itsObject(rhs.itsObject), getF(rhs.getF), setF(rhs.setF), bias(rhs.bias)
{}
......
......@@ -88,6 +88,7 @@ IndirectChannel<T>::IndirectChannel(T &object, double(T::*get)() const,
template <class T>
IndirectChannel<T>::IndirectChannel(const IndirectChannel &rhs):
Channel(),
itsObject(rhs.itsObject), getF(rhs.getF), setF(rhs.setF)
{}
......
......@@ -29,7 +29,9 @@
namespace interpolation {
TriLinearInterpolator::TriLinearInterpolator(const TriLinearInterpolator& lhs) {
TriLinearInterpolator::TriLinearInterpolator(const TriLinearInterpolator& lhs):
Interpolator3dGridTo1d(lhs)
{
coordinates_m = new ThreeDGrid(*lhs.coordinates_m);
f_m = new double**[coordinates_m->xSize()];
for (int i = 0; i < coordinates_m->xSize(); i++) {
......
......@@ -27,7 +27,8 @@ NullField::NullField()
{}
NullField::NullField(const NullField &)
NullField::NullField(const NullField & rhs):
EMField(rhs)
{}
......
......@@ -80,6 +80,7 @@ namespace Expressions {
template <class T>
AList<T>::AList(const AList<T> &rhs):
OArray<T>(rhs),
itsValue(rhs.itsValue)
{}
......
......@@ -98,6 +98,7 @@ namespace Expressions {
template <class T>
ARefExpr<T>::ARefExpr(const ARefExpr<T> &rhs):
OArray<T>(rhs),Invalidator(rhs),
obj_name(rhs.obj_name), att_name(rhs.att_name),
itsObject(rhs.itsObject), itsAttr(rhs.itsAttr)
{}
......
......@@ -85,6 +85,7 @@ namespace Expressions {
template <class T> inline
ASUnary<T>::ASUnary(const ASUnary<T> &rhs):
Scalar<T>(rhs),
fun(rhs.fun), opr(rhs.opr->clone())
{}
......
......@@ -74,6 +74,7 @@ namespace Expressions {
template <class T> inline
Indexer<T>::Indexer(const Indexer &rhs):
Scalar<T>(rhs),
lft(rhs.lft->clone()), rgt(rhs.rgt->clone())
{}
......
......@@ -84,6 +84,7 @@ namespace Expressions {
template <class T, class U> inline
SBinary<T, U>::SBinary(const SBinary &rhs):
Scalar<T>(rhs),
fun(rhs.fun), lft(rhs.lft->clone()), rgt(rhs.rgt->clone())
{}
......
......@@ -28,6 +28,7 @@
namespace Expressions {
SHash::SHash(const SHash &rhs):
Scalar<double>(rhs),
itsTable(rhs.itsTable)
{}
......
......@@ -76,6 +76,7 @@ namespace Expressions {
template <class T> inline
SNull<T>::SNull(const SNull<T> &rhs):
Scalar<T>(rhs),
fun(rhs.fun)
{}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment