You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by am...@apache.org on 2015/07/08 19:52:00 UTC
trafficserver git commit: TS-2150: Make comparator function operator
const.
Repository: trafficserver
Updated Branches:
refs/heads/master 82b09e0be -> 92c1f7719
TS-2150: Make comparator function operator const.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/92c1f771
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/92c1f771
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/92c1f771
Branch: refs/heads/master
Commit: 92c1f7719a3616d04da5f8c517113eb0dbcaca94
Parents: 82b09e0
Author: Alan M. Carroll <so...@yahoo-inc.com>
Authored: Wed Jul 8 12:51:13 2015 -0500
Committer: Alan M. Carroll <so...@yahoo-inc.com>
Committed: Wed Jul 8 12:51:13 2015 -0500
----------------------------------------------------------------------
proxy/logging/LogField.cc | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/92c1f771/proxy/logging/LogField.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogField.cc b/proxy/logging/LogField.cc
index f7be444..2614b44 100644
--- a/proxy/logging/LogField.cc
+++ b/proxy/logging/LogField.cc
@@ -120,7 +120,7 @@ LogSlice::toStrOffset(int strlen, int *offset)
-------------------------------------------------------------------------*/
struct cmp_str {
- bool operator()(ts::ConstBuffer a, ts::ConstBuffer b) { return memcmp(a._ptr, b._ptr, MAX(a._size, b._size)) < 0; }
+ bool operator() const(ts::ConstBuffer a, ts::ConstBuffer b) { return memcmp(a._ptr, b._ptr, MAX(a._size, b._size)) < 0; }
};
typedef std::map<ts::ConstBuffer, TSMilestonesType, cmp_str> milestone_map;
@@ -171,8 +171,8 @@ LogField::init_milestone_container(void)
LogField::LogField(const char *name, const char *symbol, Type type, MarshalFunc marshal, UnmarshalFunc unmarshal, SetFunc _setfunc)
: m_name(ats_strdup(name)), m_symbol(ats_strdup(symbol)), m_type(type), m_container(NO_CONTAINER), m_marshal_func(marshal),
m_unmarshal_func(unmarshal), m_unmarshal_func_map(NULL), m_agg_op(NO_AGGREGATE), m_agg_cnt(0), m_agg_val(0),
- m_milestone1(TS_MILESTONE_LAST_ENTRY), m_milestone2(TS_MILESTONE_LAST_ENTRY), m_time_field(false),
- m_alias_map(0), m_set_func(_setfunc)
+ m_milestone1(TS_MILESTONE_LAST_ENTRY), m_milestone2(TS_MILESTONE_LAST_ENTRY), m_time_field(false), m_alias_map(0),
+ m_set_func(_setfunc)
{
ink_assert(m_name != NULL);
ink_assert(m_symbol != NULL);
@@ -187,8 +187,8 @@ LogField::LogField(const char *name, const char *symbol, Type type, MarshalFunc
Ptr<LogFieldAliasMap> map, SetFunc _setfunc)
: m_name(ats_strdup(name)), m_symbol(ats_strdup(symbol)), m_type(type), m_container(NO_CONTAINER), m_marshal_func(marshal),
m_unmarshal_func(NULL), m_unmarshal_func_map(unmarshal), m_agg_op(NO_AGGREGATE), m_agg_cnt(0), m_agg_val(0),
- m_milestone1(TS_MILESTONE_LAST_ENTRY), m_milestone2(TS_MILESTONE_LAST_ENTRY), m_time_field(false),
- m_alias_map(map), m_set_func(_setfunc)
+ m_milestone1(TS_MILESTONE_LAST_ENTRY), m_milestone2(TS_MILESTONE_LAST_ENTRY), m_time_field(false), m_alias_map(map),
+ m_set_func(_setfunc)
{
ink_assert(m_name != NULL);
ink_assert(m_symbol != NULL);
@@ -242,8 +242,8 @@ LogField::milestones_from_m_name(TSMilestonesType *ms1, TSMilestonesType *ms2)
LogField::LogField(const char *field, Container container, SetFunc _setfunc)
: m_name(ats_strdup(field)), m_symbol(ats_strdup(container_names[container])), m_type(LogField::STRING), m_container(container),
m_marshal_func(NULL), m_unmarshal_func(NULL), m_unmarshal_func_map(NULL), m_agg_op(NO_AGGREGATE), m_agg_cnt(0), m_agg_val(0),
- m_milestone1(TS_MILESTONE_LAST_ENTRY), m_milestone2(TS_MILESTONE_LAST_ENTRY), m_time_field(false),
- m_alias_map(0), m_set_func(_setfunc)
+ m_milestone1(TS_MILESTONE_LAST_ENTRY), m_milestone2(TS_MILESTONE_LAST_ENTRY), m_time_field(false), m_alias_map(0),
+ m_set_func(_setfunc)
{
ink_assert(m_name != NULL);
ink_assert(m_symbol != NULL);
@@ -300,8 +300,7 @@ LogField::LogField(const LogField &rhs)
: m_name(ats_strdup(rhs.m_name)), m_symbol(ats_strdup(rhs.m_symbol)), m_type(rhs.m_type), m_container(rhs.m_container),
m_marshal_func(rhs.m_marshal_func), m_unmarshal_func(rhs.m_unmarshal_func), m_unmarshal_func_map(rhs.m_unmarshal_func_map),
m_agg_op(rhs.m_agg_op), m_agg_cnt(0), m_agg_val(0), m_milestone1(TS_MILESTONE_LAST_ENTRY),
- m_milestone2(TS_MILESTONE_LAST_ENTRY), m_time_field(rhs.m_time_field), m_alias_map(rhs.m_alias_map),
- m_set_func(rhs.m_set_func)
+ m_milestone2(TS_MILESTONE_LAST_ENTRY), m_time_field(rhs.m_time_field), m_alias_map(rhs.m_alias_map), m_set_func(rhs.m_set_func)
{
ink_assert(m_name != NULL);
ink_assert(m_symbol != NULL);