X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Futil.cpp;h=80186e5fa13652d981278155478ac1a9f3f5c77b;hb=3a0d69bbfe48f57128565f4bdd13777ca3a0d5c4;hp=73621d8abdc3fd8fb9d79c887c8b4c81a726dbfb;hpb=e76d26de9454bd57f444f77c18735486190f8112;p=novacoin.git diff --git a/src/util.cpp b/src/util.cpp index 73621d8..80186e5 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -33,12 +33,6 @@ namespace boost { #include #ifdef WIN32 -#ifdef _MSC_VER -#pragma warning(disable:4786) -#pragma warning(disable:4804) -#pragma warning(disable:4805) -#pragma warning(disable:4717) -#endif #ifdef _WIN32_WINNT #undef _WIN32_WINNT #endif @@ -400,16 +394,16 @@ string FormatMoney(int64_t n, bool fPlus) string str = strprintf("%" PRId64 ".%06" PRId64, quotient, remainder); // Right-trim excess zeros before the decimal point: - int nTrim = 0; + size_t nTrim = 0; for (size_t i = str.size()-1; (str[i] == '0' && isdigit(str[i-2])); --i) ++nTrim; if (nTrim) str.erase(str.size()-nTrim, nTrim); if (n < 0) - str.insert((unsigned int)0, 1, '-'); + str.insert(0u, 1, '-'); else if (fPlus && n > 0) - str.insert((unsigned int)0, 1, '+'); + str.insert(0u, 1, '+'); return str; } @@ -1492,4 +1486,4 @@ std::string DateTimeStrFormat(const char* pszFormat, int64_t nTime) ss.imbue(loc); ss << boost::posix_time::from_time_t(nTime); return ss.str(); -} \ No newline at end of file +}