diff options
| author | Luke Dashjr <[email protected]> | 2012-05-04 18:57:03 +0000 |
|---|---|---|
| committer | Luke Dashjr <[email protected]> | 2012-05-04 18:57:03 +0000 |
| commit | a1a5a890631beaf40236ab417b2f9816ccbae5a1 (patch) | |
| tree | f4a760bb91cab4a4e16b2338650d1665e2eef02d /src/serialize.h | |
| parent | Merge branch '0.5.x' into 0.6.0.x (diff) | |
| parent | Merge branch '0.4.x' into 0.5.x (diff) | |
| download | discoin-a1a5a890631beaf40236ab417b2f9816ccbae5a1.tar.xz discoin-a1a5a890631beaf40236ab417b2f9816ccbae5a1.zip | |
Merge branch '0.5.x' into 0.6.0.x
Conflicts:
src/main.cpp
src/serialize.h
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 25777fe3c..2cb3563f8 100644 --- a/src/serialize.h +++ b/src/serialize.h @@ -1234,8 +1234,6 @@ public: int nType; int nVersion; - typedef FILE element_type; - CAutoFile(FILE* filenew=NULL, int nTypeIn=SER_DISK, int nVersionIn=PROTOCOL_VERSION) { file = filenew; |