summaryrefslogtreecommitdiff
path: root/protocols/WhatsApp/src/WhatsAPI++/ByteArray.cpp
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2013-06-02 18:35:56 +0000
committerGeorge Hazan <george.hazan@gmail.com>2013-06-02 18:35:56 +0000
commit11822f442f96b074e5e39bd4cc14d277205a9307 (patch)
tree8257ab929e3f2d5e626f693ca13c90b50aa196f0 /protocols/WhatsApp/src/WhatsAPI++/ByteArray.cpp
parent329ad84fa5b5a813b032f416e959eb2b0bb3582e (diff)
first version of Wassup that compiles
git-svn-id: http://svn.miranda-ng.org/main/trunk@4863 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/WhatsApp/src/WhatsAPI++/ByteArray.cpp')
-rw-r--r--protocols/WhatsApp/src/WhatsAPI++/ByteArray.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/protocols/WhatsApp/src/WhatsAPI++/ByteArray.cpp b/protocols/WhatsApp/src/WhatsAPI++/ByteArray.cpp
index 44354a4e3d..785c5c2323 100644
--- a/protocols/WhatsApp/src/WhatsAPI++/ByteArray.cpp
+++ b/protocols/WhatsApp/src/WhatsAPI++/ByteArray.cpp
@@ -4,7 +4,8 @@
* Created on: 26/06/2012
* Author: Antonio
*/
-#include "stdafx.h"
+
+#include "../common.h"
#include "ByteArray.h"
#include "WAException.h"
#include <iostream>
@@ -79,7 +80,7 @@ ByteArrayOutputStream::~ByteArrayOutputStream() {
ByteArrayInputStream::ByteArrayInputStream(std::vector<unsigned char>* buf, size_t off, size_t length ) {
this->buf = buf;
this->pos = off;
- this->count = std::min(off + length, buf->size());
+ this->count = min(off + length, buf->size());
}
ByteArrayInputStream::ByteArrayInputStream(std::vector<unsigned char>* buf) {
@@ -114,7 +115,7 @@ int ByteArrayInputStream::read(std::vector<unsigned char>& b, size_t off, size_
}
b[off + i] = (unsigned char) c;
}
- } catch (std::exception& ee) {
+ } catch (std::exception& ) {
}
return i;
}