integration phase

This commit is contained in:
Wladimir J. van der Laan
2011-05-14 11:18:39 +02:00
parent 1f2e0df865
commit 6644d98d9e
20 changed files with 5521 additions and 11 deletions

View File

@@ -302,7 +302,7 @@ public:
char psz[sizeof(pn)*2 + 1];
for (int i = 0; i < sizeof(pn); i++)
sprintf(psz + i*2, "%02x", ((unsigned char*)pn)[sizeof(pn) - i - 1]);
return string(psz, psz + sizeof(pn)*2);
return std::string(psz, psz + sizeof(pn)*2);
}
void SetHex(const char* psz)
@@ -632,7 +632,7 @@ inline const uint256 operator-(const uint256& a, const uint256& b) { return
inline int Testuint256AdHoc(vector<string> vArg)
inline int Testuint256AdHoc(std::vector<std::string> vArg)
{
uint256 g(0);