aboutsummaryrefslogtreecommitdiffstats
path: root/src/ssl
diff options
context:
space:
mode:
authorlloyd <[email protected]>2010-10-12 19:51:32 +0000
committerlloyd <[email protected]>2010-10-12 19:51:32 +0000
commita85f136550c08fc878e3983866af0e6460e980da (patch)
treee495666a243affb92b8a1c5097d536b22c305580 /src/ssl
parentff2210b035a1598bf99e18a578ff075bece8fbe5 (diff)
Use size_t in filters
This breaks API for anyone creating their own Filter types, but it had to happen eventually.
Diffstat (limited to 'src/ssl')
-rw-r--r--src/ssl/tls_client.cpp2
-rw-r--r--src/ssl/tls_server.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/ssl/tls_client.cpp b/src/ssl/tls_client.cpp
index ad4074ab2..d6d62d59a 100644
--- a/src/ssl/tls_client.cpp
+++ b/src/ssl/tls_client.cpp
@@ -205,7 +205,7 @@ u32bit TLS_Client::read(byte out[], u32bit length)
break;
}
- u32bit got = std::min(read_buf.size(), length);
+ u32bit got = std::min<size_t>(read_buf.size(), length);
read_buf.read(out, got);
return got;
}
diff --git a/src/ssl/tls_server.cpp b/src/ssl/tls_server.cpp
index 3d72d9dca..1503912d0 100644
--- a/src/ssl/tls_server.cpp
+++ b/src/ssl/tls_server.cpp
@@ -166,7 +166,7 @@ u32bit TLS_Server::read(byte out[], u32bit length)
break;
}
- u32bit got = std::min(read_buf.size(), length);
+ u32bit got = std::min<size_t>(read_buf.size(), length);
read_buf.read(out, got);
return got;
}