Merge branch 'master' into events

This commit is contained in:
Lourens Naudé
2012-05-04 02:35:22 +01:00
9 changed files with 94 additions and 42 deletions

View File

@@ -84,6 +84,7 @@ namespace zmq
unsigned char *inpos;
size_t insize;
decoder_t decoder;
bool input_error;
unsigned char *outpos;
size_t outsize;