From 1abeec3a43e961694e11178cf39be77f707b0bb0 Mon Sep 17 00:00:00 2001
From: Daniel Schwen <daniel.schwen@inl.gov>
Date: Thu, 23 Aug 2018 11:13:52 -0600
Subject: [PATCH] Fix initialization order (#1076)
---
src/USER-MANIFOLD/manifold_gaussian_bump.cpp | 2 +-
src/fix_neigh_history.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/USER-MANIFOLD/manifold_gaussian_bump.cpp b/src/USER-MANIFOLD/manifold_gaussian_bump.cpp
index a9ee35bbfc..cbb47ef92d 100644
--- a/src/USER-MANIFOLD/manifold_gaussian_bump.cpp
+++ b/src/USER-MANIFOLD/manifold_gaussian_bump.cpp
@@ -25,7 +25,6 @@ public:
cubic_hermite( double x0, double x1, double y0, double y1,
double yp0, double yp1, LAMMPS_NS::Error *err ) :
- x0(x0), x1(x1), y0(y0), y1(y1), yp0(yp0), yp1(yp1),
a( 2*x0 + 2 - 2*x1 ),
b( -3*x0 - 3 + 3*x1 ),
c( 1.0 ),
@@ -34,6 +33,7 @@ public:
u( -3*y0 + 3*y1 - 2*yp0 - yp1 ),
v( yp0 ),
w( y0 ),
+ x0(x0), x1(x1), y0(y0), y1(y1), yp0(yp0), yp1(yp1),
err(err)
{
test();
diff --git a/src/fix_neigh_history.cpp b/src/fix_neigh_history.cpp
index 44c2003bf1..9661409a6a 100644
--- a/src/fix_neigh_history.cpp
+++ b/src/fix_neigh_history.cpp
@@ -35,7 +35,7 @@ enum{DEFAULT,NPARTNER,PERPARTNER}; // also set in fix neigh/history/omp
FixNeighHistory::FixNeighHistory(LAMMPS *lmp, int narg, char **arg) :
Fix(lmp, narg, arg),
- npartner(NULL), partner(NULL), valuepartner(NULL), pair(NULL),
+ pair(NULL), npartner(NULL), partner(NULL), valuepartner(NULL),
ipage_atom(NULL), dpage_atom(NULL), ipage_neigh(NULL), dpage_neigh(NULL)
{
if (narg != 4) error->all(FLERR,"Illegal fix NEIGH_HISTORY command");
--
GitLab