summaryrefslogtreecommitdiff
path: root/protocols/WhatsApp/src/WhatsAPI++/ByteArray.cpp
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2013-06-24 12:29:37 +0000
committerGeorge Hazan <george.hazan@gmail.com>2013-06-24 12:29:37 +0000
commitdc2a9c66749ef4c8c6a748218bf80b80d0bbe0d6 (patch)
tree4d854eda13f45812127bb1773730355c26dff417 /protocols/WhatsApp/src/WhatsAPI++/ByteArray.cpp
parent852df1e2fd8a0e220065b0eb1443b3e834101531 (diff)
- custom base64 encoder removed;
- warning fixes git-svn-id: http://svn.miranda-ng.org/main/trunk@5117 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/WhatsApp/src/WhatsAPI++/ByteArray.cpp')
-rw-r--r--protocols/WhatsApp/src/WhatsAPI++/ByteArray.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/protocols/WhatsApp/src/WhatsAPI++/ByteArray.cpp b/protocols/WhatsApp/src/WhatsAPI++/ByteArray.cpp
index f379a2061a..5c7d16042e 100644
--- a/protocols/WhatsApp/src/WhatsAPI++/ByteArray.cpp
+++ b/protocols/WhatsApp/src/WhatsAPI++/ByteArray.cpp
@@ -5,6 +5,7 @@
* Author: Antonio
*/
+#include "../common.h"
#include "ByteArray.h"
#include "WAException.h"
#include <iostream>
@@ -116,7 +117,7 @@ int ByteArrayInputStream::read(std::vector<unsigned char>& b, size_t off, size_
}
} catch (std::exception& ) {
}
- return i;
+ return (int)i;
}
ByteArrayInputStream::~ByteArrayInputStream() {