From 33c477bba24444f904e3bb3de40e4c98e91ae4ea Mon Sep 17 00:00:00 2001
From: sjplimp <sjplimp@f3b2605a-c512-4ea7-a41b-209d697bcdaa>
Date: Thu, 28 Jun 2007 15:10:19 +0000
Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@695
 f3b2605a-c512-4ea7-a41b-209d697bcdaa

---
 src/KSPACE/pair_lj_cut_coul_long.h |  2 +-
 src/XTC/dump_xtc.cpp               | 11 +++++++----
 src/output.cpp                     |  1 +
 src/pair_lj_cut_coul_cut.h         |  2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/KSPACE/pair_lj_cut_coul_long.h b/src/KSPACE/pair_lj_cut_coul_long.h
index 6870b63197..aaae3b8afb 100644
--- a/src/KSPACE/pair_lj_cut_coul_long.h
+++ b/src/KSPACE/pair_lj_cut_coul_long.h
@@ -21,7 +21,7 @@ namespace LAMMPS_NS {
 class PairLJCutCoulLong : public Pair {
  public:
   PairLJCutCoulLong(class LAMMPS *);
-  ~PairLJCutCoulLong();
+  virtual ~PairLJCutCoulLong();
   virtual void compute(int, int);
   virtual void settings(int, char **);
   void coeff(int, char **);
diff --git a/src/XTC/dump_xtc.cpp b/src/XTC/dump_xtc.cpp
index e598bde9f6..484870c209 100644
--- a/src/XTC/dump_xtc.cpp
+++ b/src/XTC/dump_xtc.cpp
@@ -38,6 +38,9 @@ using namespace LAMMPS_NS;
 #define EPS 1e-5
 #define XTC_MAGIC 1995
 
+#define MYMIN(a,b) ((a) < (b) ? (a) : (b))
+#define MYMAX(a,b) ((a) > (b) ? (a) : (b))
+
 int xdropen(XDR *, const char *, const char *);
 int xdrclose(XDR *) ;
 void xdrfreebuf();
@@ -830,9 +833,9 @@ int xdr3dfcoord(XDR *xdrs, float *fp, int *size, float *precision)
       smallidx++;
     }
     xdr_int(xdrs, &smallidx);
-    maxidx = MIN(LASTIDX, smallidx + 8) ;
+    maxidx = MYMIN(LASTIDX, smallidx + 8) ;
     minidx = maxidx - 8; /* often this equal smallidx */
-    smaller = magicints[MAX(FIRSTIDX, smallidx-1)] / 2;
+    smaller = magicints[MYMAX(FIRSTIDX, smallidx-1)] / 2;
     small = magicints[smallidx] / 2;
     sizesmall[0] = sizesmall[1] = sizesmall[2] = magicints[smallidx];
     larger = magicints[maxidx] / 2;
@@ -1006,9 +1009,9 @@ int xdr3dfcoord(XDR *xdrs, float *fp, int *size, float *precision)
     }
     
     xdr_int(xdrs, &smallidx);
-    maxidx = MIN(LASTIDX, smallidx + 8) ;
+    maxidx = MYMIN(LASTIDX, smallidx + 8) ;
     minidx = maxidx - 8; /* often this equal smallidx */
-    smaller = magicints[MAX(FIRSTIDX, smallidx-1)] / 2;
+    smaller = magicints[MYMAX(FIRSTIDX, smallidx-1)] / 2;
     small = magicints[smallidx] / 2;
     sizesmall[0] = sizesmall[1] = sizesmall[2] = magicints[smallidx] ;
     larger = magicints[maxidx];
diff --git a/src/output.cpp b/src/output.cpp
index 31f31e3702..fd5d765c11 100644
--- a/src/output.cpp
+++ b/src/output.cpp
@@ -36,6 +36,7 @@
 using namespace LAMMPS_NS;
 
 #define DELTA 1
+
 #define MYMIN(a,b) ((a) < (b) ? (a) : (b))
 #define MYMAX(a,b) ((a) > (b) ? (a) : (b))
 
diff --git a/src/pair_lj_cut_coul_cut.h b/src/pair_lj_cut_coul_cut.h
index 9f831834a7..8e027e5ac9 100644
--- a/src/pair_lj_cut_coul_cut.h
+++ b/src/pair_lj_cut_coul_cut.h
@@ -21,7 +21,7 @@ namespace LAMMPS_NS {
 class PairLJCutCoulCut : public Pair {
  public:
   PairLJCutCoulCut(class LAMMPS *);
-  ~PairLJCutCoulCut();
+  virtual ~PairLJCutCoulCut();
   virtual void compute(int, int);
   virtual void settings(int, char **);
   void coeff(int, char **);