--- branches/development/src/applications/staticProps/SpatialStatistics.cpp 2013/05/17 14:41:42 1875 +++ trunk/src/applications/staticProps/SpatialStatistics.cpp 2013/06/18 16:07:27 1881 @@ -43,6 +43,10 @@ #include "applications/staticProps/SpatialStatistics.hpp" #include "io/DumpReader.hpp" #include "primitives/Molecule.hpp" +#ifdef _MSC_VER +#define isnan(x) _isnan((x)) +#define isinf(x) (!_finite(x) && !_isnan(x)) +#endif namespace OpenMD { @@ -137,7 +141,7 @@ namespace OpenMD { processStuntDouble( sd, bin ); dynamic_cast(counts_->accumulator[bin])->add(1); - } + } } @@ -319,7 +323,6 @@ namespace OpenMD { } SlabStatistics::~SlabStatistics() { - delete z_; } @@ -368,7 +371,6 @@ namespace OpenMD { } ShellStatistics::~ShellStatistics() { - delete r_; } int ShellStatistics::getBin(Vector3d pos) {