From b9144d63325d05e52cf80369bf935e3bd9d9e275 Mon Sep 17 00:00:00 2001
From: Dan Ibanez <daibane@sandia.gov>
Date: Thu, 5 Jan 2017 20:22:15 -0700
Subject: [PATCH] Revert "move enum to pair.h"
This reverts commit aebc8ea826711af42b2bc381c184c961e4ce7256.
---
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 f8ae641d2f..5d73a592e8 100644
--- a/src/pair.cpp
+++ b/src/pair.cpp
@@ -43,6 +43,8 @@
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 fbb6d8408b..3378115e49 100644
--- a/src/pair.h
+++ b/src/pair.h
@@ -32,8 +32,6 @@ 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