--- branches/development/src/utils/StringUtils.cpp 2011/09/14 21:15:17 1629 +++ branches/development/src/utils/StringUtils.cpp 2012/10/22 20:42:10 1808 @@ -36,12 +36,25 @@ * [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). - * [4] Vardeman & Gezelter, in progress (2009). + * [4] Kuang & Gezelter, J. Chem. Phys. 133, 164101 (2010). + * [5] Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011). */ +#include "config.h" #include +#include +#include +#include +#include #include "utils/StringUtils.hpp" + +#ifdef _MSC_VER +#define strcasecmp _stricmp +#define strdup _strdup +#define strtoull _strtoui64 +#endif + namespace OpenMD { std::string UpperCase(const std::string& S) { std::string uc = S; @@ -97,7 +110,6 @@ namespace OpenMD { int foundText = 0; int lineNum; char* the_token; - char* eof_test; // rewind the stream theStream.seekg (0, std::ios::beg); @@ -248,10 +260,10 @@ namespace OpenMD { /** * memparse - parse a string with mem suffixes into a number - * @ptr: Where parse begins - * @retptr: (output) Pointer to next char after parse completes + * @param ptr: Where parse begins + * @param retptr: (output) Pointer to next char after parse completes * - * Parses a string into a number. The number stored at @ptr is + * Parses a string into a number. The number stored at @param ptr is * potentially suffixed with %K (for kilobytes, or 1024 bytes), * %M (for megabytes, or 1048576 bytes), or %G (for gigabytes, or * 1073741824). If the number is suffixed with K, M, or G, then