Updated Branches: refs/heads/master ce8fb7ef1 -> bb5402304
TS-1135: Remove std::distance to make Solaris happy Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/bb540230 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/bb540230 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/bb540230 Branch: refs/heads/master Commit: bb5402304c30b8b2107e1f845bb301f5a6a9b022 Parents: ce8fb7e Author: James Peach <[email protected]> Authored: Tue Mar 27 20:51:28 2012 -0700 Committer: James Peach <[email protected]> Committed: Tue Mar 27 20:51:28 2012 -0700 ---------------------------------------------------------------------- iocore/net/SSLCertLookup.cc | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bb540230/iocore/net/SSLCertLookup.cc ---------------------------------------------------------------------- diff --git a/iocore/net/SSLCertLookup.cc b/iocore/net/SSLCertLookup.cc index fbcf2cb..2795b2b 100644 --- a/iocore/net/SSLCertLookup.cc +++ b/iocore/net/SSLCertLookup.cc @@ -30,8 +30,6 @@ #include "Trie.h" #include "ts/TestBox.h" -#include <algorithm> - #include <openssl/bio.h> #include <openssl/pem.h> #include <openssl/x509.h> @@ -437,14 +435,15 @@ reverse_dns_name(const char * hostname, char (&reversed)[TS_MAX_HOST_NAME_LEN+1] while (*part) { ssize_t len = strcspn(part, "."); + ssize_t remain = ptr - reversed; // We are going to put the '.' separator back for all components except the first. if (*ptr == '\0') { - if (std::distance(reversed, ptr) < len) { + if (remain < len) { return NULL; } } else { - if (std::distance(reversed, ptr) < len + 1) { + if (remain < (len + 1)) { return NULL; } *(--ptr) = '.';
