diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-05-04 18:55:15 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-05-04 18:55:15 +0000 |
| commit | b2e5f797b5670c4dc7d0dfd696d21977575fe9ed (patch) | |
| tree | 308157c6a728931ff26a8260e204c633e75ead1d /src/serialize.h | |
| parent | 6a89317f621692e7d5c0c67b3a1440bf1b52b328 (diff) | |
| parent | ad5a4c7c471912aa0bef52c33a1abfb01fe6d89d (diff) | |
| download | bitcoin-b2e5f797b5670c4dc7d0dfd696d21977575fe9ed.tar.xz | |
Merge branch '0.4.x' into 0.5.x
Diffstat (limited to 'src/serialize.h')
| -rw-r--r-- | src/serialize.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/serialize.h b/src/serialize.h index 346594c86a..6bdf378229 100644 --- a/src/serialize.h +++ b/src/serialize.h @@ -1245,8 +1245,6 @@ public: int nType; int nVersion; - typedef FILE element_type; - CAutoFile(FILE* filenew=NULL, int nTypeIn=SER_DISK, int nVersionIn=VERSION) { file = filenew; |