git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@3655 f3b2605a-c512-4ea7-a41b-209d697bcdaa

src/atom.cpp

@@ -16,6 +16,7 @@
 #include "stdlib.h"
 #include "string.h"
 #include "atom.h"
+#include "style_atom.h"
 #include "atom_vec.h"
 #include "comm.h"
 #include "force.h"
@@ -29,10 +30,6 @@
 #include "memory.h"
 #include "error.h"
 
-#define AtomInclude
-#include "style.h"
-#undef AtomInclude
-
 using namespace LAMMPS_NS;
 
 #define DELTA 1
@@ -252,11 +249,11 @@ AtomVec *Atom::new_avec(const char *style, int narg, char **arg)
 {
   if (0) return NULL;
 
-#define AtomClass
+#define ATOM_CLASS
 #define AtomStyle(key,Class) \
   else if (strcmp(style,#key) == 0) return new Class(lmp,narg,arg);
-#include "style.h"
-#undef AtomClass
+#include "style_atom.h"
+#undef ATOM_CLASS
 
   else error->all("Invalid atom style");
   return NULL;