From a7619b8daec465d1a6ab367e1a137ee6f64cf5c9 Mon Sep 17 00:00:00 2001 From: Oliver Henrich Date: Thu, 15 Jul 2021 17:32:19 +0100 Subject: [PATCH] Removed virtual keyword, defined internal variable --- src/CG-DNA/atom_vec_oxdna.cpp | 5 +++-- src/CG-DNA/atom_vec_oxdna.h | 2 +- src/atom_vec_hybrid.h | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/CG-DNA/atom_vec_oxdna.cpp b/src/CG-DNA/atom_vec_oxdna.cpp index 240a38709b..ed37fd0877 100644 --- a/src/CG-DNA/atom_vec_oxdna.cpp +++ b/src/CG-DNA/atom_vec_oxdna.cpp @@ -83,6 +83,7 @@ void AtomVecOxdna::data_atom_post(int ilocal) void AtomVecOxdna::data_bonds_post(int m, int num_bond, tagint atom1, tagint atom2, tagint id_offset) { + int n; tagint *id5p = atom->id5p; if (id_offset) { @@ -90,7 +91,7 @@ void AtomVecOxdna::data_bonds_post(int m, int num_bond, tagint atom1, atom2 += id_offset; } - if ((m = atom->map(atom1)) >= 0) { - id5p[m] = atom2; + if ((n = atom->map(atom1)) >= 0) { + id5p[n] = atom2; } } diff --git a/src/CG-DNA/atom_vec_oxdna.h b/src/CG-DNA/atom_vec_oxdna.h index e3297a0482..eb167e6859 100644 --- a/src/CG-DNA/atom_vec_oxdna.h +++ b/src/CG-DNA/atom_vec_oxdna.h @@ -30,8 +30,8 @@ class AtomVecOxdna : public AtomVec { ~AtomVecOxdna(); void grow_pointers(); - virtual void data_bonds_post(int, int, tagint, tagint, tagint); void data_atom_post(int); + void data_bonds_post(int, int, tagint, tagint, tagint); private: tagint *id5p; diff --git a/src/atom_vec_hybrid.h b/src/atom_vec_hybrid.h index e596754fb3..949ae37319 100644 --- a/src/atom_vec_hybrid.h +++ b/src/atom_vec_hybrid.h @@ -56,7 +56,7 @@ class AtomVecHybrid : public AtomVec { void create_atom_post(int); void data_atom_post(int); - virtual void data_bonds_post(int, int, tagint, tagint, tagint); + void data_bonds_post(int, int, tagint, tagint, tagint); void pack_data_pre(int); void pack_data_post(int);