--- branches/development/src/io/StatWriter.cpp	2012/07/03 18:32:27	1764
+++ branches/development/src/io/StatWriter.cpp	2013/02/20 15:39:39	1850
@@ -35,13 +35,17 @@
  *                                                                      
  * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).             
  * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
- * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).          
+ * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 234107 (2008).          
  * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
  * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
  */
  
 #define _LARGEFILE_SOURCE64
 #define _FILE_OFFSET_BITS 64
+#ifdef _MSC_VER
+#define isnan(x) _isnan((x))
+#define isinf(x) (!_finite(x) && !_isnan(x))
+#endif
 
 #include "io/StatWriter.hpp"
 #include "brains/Stats.hpp"
@@ -104,7 +108,7 @@ namespace OpenMD {
 
       //write title
       statfile_ << "#";
-      for (int i = 0; i <mask.size(); ++i) {
+      for (unsigned int i = 0; i <mask.size(); ++i) {
 	if (mask[i]) {
 	  statfile_ << "\t" << stats_->getTitle(i) << 
             "(" << stats_->getUnits(i) << ")";
@@ -125,7 +129,7 @@ namespace OpenMD {
 
       Stats::StatsBitSet mask = stats_->getStatsMask();
       statfile_.precision(8);
-      for (int i = 0; i < mask.size(); ++i) {
+      for (unsigned int i = 0; i < mask.size(); ++i) {
 	if (mask[i]) {
           if (stats_->getDataType(i) == "RealType")
             writeReal(i);