From aebc8ea826711af42b2bc381c184c961e4ce7256 Mon Sep 17 00:00:00 2001
From: Dan Ibanez <dan.a.ibanez@gmail.com>
Date: Wed, 4 Jan 2017 10:51:31 -0700
Subject: [PATCH] move enum to pair.h
to avoid having it be replicated
in several different locations
---
src/pair.cpp | 2 --
src/pair.h | 2 ++
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/pair.cpp b/src/pair.cpp
index 5d73a592e8..f8ae641d2f 100644
--- a/src/pair.cpp
+++ b/src/pair.cpp
@@ -43,8 +43,6 @@
using namespace LAMMPS_NS;
using namespace MathConst;
-enum{NONE,RLINEAR,RSQ,BMP};
-
// allocate space for static class instance variable and initialize it
int Pair::instance_total = 0;
diff --git a/src/pair.h b/src/pair.h
index 3378115e49..fbb6d8408b 100644
--- a/src/pair.h
+++ b/src/pair.h
@@ -32,6 +32,8 @@ class Pair : protected Pointers {
friend class Info;
public:
+ enum{NONE,RLINEAR,RSQ,BMP};
+
static int instance_total; // # of Pair classes ever instantiated
double eng_vdwl,eng_coul; // accumulated energies
--
GitLab