diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-04-22 10:05:43 -0400 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-04-22 10:05:43 -0400 |
| commit | a93ab877877925c60b2dbf56bdde8aa46b6b7391 (patch) | |
| tree | 3c473dd4151e38a72763600839a16f4a3b509325 /src/base58.h | |
| parent | e401e5eb79f944bf772e541baed9ef45f0cb4f43 (diff) | |
| parent | d0fe14ffecda4af98ffe7b1523f9a903bf7518a0 (diff) | |
| download | bitcoin-a93ab877877925c60b2dbf56bdde8aa46b6b7391.tar.xz | |
Merge branch '0.4.x' into 0.5.x
Conflicts:
src/main.cpp
Diffstat (limited to 'src/base58.h')
| -rw-r--r-- | src/base58.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/base58.h b/src/base58.h index cace423d6e..d7fedb1a74 100644 --- a/src/base58.h +++ b/src/base58.h @@ -270,7 +270,7 @@ public: bool IsValid() const { - int nExpectedSize = 20; + unsigned int nExpectedSize = 20; bool fExpectTestNet = false; switch(nVersion) { |