Sync to bitcoin git e94010b239

This commit is contained in:
Wladimir J. van der Laan
2011-07-07 15:22:54 +02:00
parent fbaee7a853
commit ae3d0aba15
11 changed files with 113 additions and 114 deletions

View File

@@ -344,11 +344,6 @@ string FormatMoney(int64 n, bool fPlus)
if (nTrim)
str.erase(str.size()-nTrim, nTrim);
// Insert thousands-separators:
size_t point = str.find(".");
for (int i = (str.size()-point)+3; i < str.size(); i += 4)
if (isdigit(str[str.size() - i - 1]))
str.insert(str.size() - i, 1, ',');
if (n < 0)
str.insert((unsigned int)0, 1, '-');
else if (fPlus && n > 0)
@@ -371,8 +366,6 @@ bool ParseMoney(const char* pszIn, int64& nRet)
p++;
for (; *p; p++)
{
if (*p == ',' && p > pszIn && isdigit(p[-1]) && isdigit(p[1]) && isdigit(p[2]) && isdigit(p[3]) && !isdigit(p[4]))
continue;
if (*p == '.')
{
p++;