summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvitalyster <vitalyster@gmail.com>2012-01-11 16:41:00 (GMT)
committerRemko Tronçon <git@el-tramo.be>2012-01-15 09:38:07 (GMT)
commit1c8be43af642dd60763a0d34171685aa10ab1e04 (patch)
tree4680d6624a05b350317fc6b15dbe7cceb8e796f9
parent7ed5e3e07f3c4dbb54bc99051813ccc6bd05ed21 (diff)
downloadswift-contrib-1c8be43af642dd60763a0d34171685aa10ab1e04.zip
swift-contrib-1c8be43af642dd60763a0d34171685aa10ab1e04.tar.bz2
Fixed compilation with msvc and boost-1.48
License: This patch is BSD-licensed, see http://www.opensource.org/licenses/bsd-license.php
-rw-r--r--Swiften/Network/HostAddress.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Swiften/Network/HostAddress.cpp b/Swiften/Network/HostAddress.cpp
index 7ba2a7f..f00581f 100644
--- a/Swiften/Network/HostAddress.cpp
+++ b/Swiften/Network/HostAddress.cpp
@@ -31,14 +31,14 @@ HostAddress::HostAddress(const std::string& address) {
HostAddress::HostAddress(const unsigned char* address, int length) {
assert(length == 4 || length == 16);
if (length == 4) {
- boost::array<unsigned char, 4> data;
+ boost::asio::ip::address_v4::bytes_type data;
for (int i = 0; i < length; ++i) {
data[i] = address[i];
}
address_ = boost::asio::ip::address(boost::asio::ip::address_v4(data));
}
else {
- boost::array<unsigned char, 16> data;
+ boost::asio::ip::address_v6::bytes_type data;
for (int i = 0; i < length; ++i) {
data[i] = address[i];
}