[42/50] git commit: TS-2468: portability fixes

[zw...@apache.org]

TS-2468: portability fixes


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/52c2da6e
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/52c2da6e
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/52c2da6e

Branch: refs/heads/5.0.x
Commit: 52c2da6ed8ef225b94e3a21460a88990e31b61fc
Parents: 0a6ae3b
Author: James Peach <jp...@apache.org>
Authored: Thu Jan 2 14:27:43 2014 -0800
Committer: James Peach <jp...@apache.org>
Committed: Thu Jan 2 14:27:43 2014 -0800

----------------------------------------------------------------------
 plugins/experimental/balancer/balancer.cc | 3 ++-
 plugins/experimental/balancer/hash.cc     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/52c2da6e/plugins/experimental/balancer/balancer.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/balancer/balancer.cc b/plugins/experimental/balancer/balancer.cc
index ea5150a..1eb0077 100644
--- a/plugins/experimental/balancer/balancer.cc
+++ b/plugins/experimental/balancer/balancer.cc
@@ -23,9 +23,10 @@
 
 #include "balancer.h"
 #include <ts/remap.h>
+#include <stdio.h>
 #include <getopt.h>
 #include <string.h>
-#include <functional>
+#include <iterator>
 
 // The policy type is the first comma-separated token.
 static BalancerInstance *

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/52c2da6e/plugins/experimental/balancer/hash.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/balancer/hash.cc b/plugins/experimental/balancer/hash.cc
index f6595a8..9d2a204 100644
--- a/plugins/experimental/balancer/hash.cc
+++ b/plugins/experimental/balancer/hash.cc
@@ -151,7 +151,7 @@ struct HashBalancer : public BalancerInstance
 
     MD5_Init(&ctx);
 
-    for (hash_part_type::const_iterator i = this->hash_parts.cbegin(); i != this->hash_parts.cend(); ++i) {
+    for (hash_part_type::const_iterator i = this->hash_parts.begin(); i != this->hash_parts.end(); ++i) {
       (*i)(txn, rri, &ctx);
     }