[trafficserver] 03/04: Rename Macher template parameters to avoid a name collision.

[jp...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jpeach pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/trafficserver.git

commit 5846e26f98f1922771b5accc5a4667580f0eae4e
Author: James Peach <jp...@apache.org>
AuthorDate: Sat Feb 18 14:19:45 2017 -0800

    Rename Macher template parameters to avoid a name collision.
---
 proxy/ControlMatcher.cc | 194 ++++++++++++++++++++++++------------------------
 proxy/ControlMatcher.h  |  44 +++++------
 2 files changed, 119 insertions(+), 119 deletions(-)

diff --git a/proxy/ControlMatcher.cc b/proxy/ControlMatcher.cc
index dba507b..13cb1a7 100644
--- a/proxy/ControlMatcher.cc
+++ b/proxy/ControlMatcher.cc
@@ -87,54 +87,54 @@ HttpRequestData::get_client_ip()
  *   Begin class HostMatcher
  *************************************************************/
 
-template <class Data, class Result>
-HostMatcher<Data, Result>::HostMatcher(const char *name, const char *filename)
+template <class Data, class MatchResult>
+HostMatcher<Data, MatchResult>::HostMatcher(const char *name, const char *filename)
   : data_array(nullptr), array_len(-1), num_el(-1), matcher_name(name), file_name(filename)
 {
   host_lookup = new HostLookup(name);
 }
 
-template <class Data, class Result> HostMatcher<Data, Result>::~HostMatcher()
+template <class Data, class MatchResult> HostMatcher<Data, MatchResult>::~HostMatcher()
 {
   delete host_lookup;
   delete[] data_array;
 }
 
 //
-// template <class Data,class Result>
-// void HostMatcher<Data,Result>::Print()
+// template <class Data,class MatchResult>
+// void HostMatcher<Data,MatchResult>::Print()
 //
 //  Debugging Method
 //
-template <class Data, class Result>
+template <class Data, class MatchResult>
 void
-HostMatcher<Data, Result>::Print()
+HostMatcher<Data, MatchResult>::Print()
 {
   printf("\tHost/Domain Matcher with %d elements\n", num_el);
   host_lookup->Print(PrintFunc);
 }
 
 //
-// template <class Data,class Result>
-// void HostMatcher<Data,Result>::PrintFunc(void* opaque_data)
+// template <class Data,class MatchResult>
+// void HostMatcher<Data,MatchResult>::PrintFunc(void* opaque_data)
 //
 //  Debugging Method
 //
-template <class Data, class Result>
+template <class Data, class MatchResult>
 void
-HostMatcher<Data, Result>::PrintFunc(void *opaque_data)
+HostMatcher<Data, MatchResult>::PrintFunc(void *opaque_data)
 {
   Data *d = (Data *)opaque_data;
   d->Print();
 }
 
-// void HostMatcher<Data,Result>::AllocateSpace(int num_entries)
+// void HostMatcher<Data,MatchResult>::AllocateSpace(int num_entries)
 //
 //  Allocates the the HostLeaf and Data arrays
 //
-template <class Data, class Result>
+template <class Data, class MatchResult>
 void
-HostMatcher<Data, Result>::AllocateSpace(int num_entries)
+HostMatcher<Data, MatchResult>::AllocateSpace(int num_entries)
 {
   // Should not have been allocated before
   ink_assert(array_len == -1);
@@ -147,14 +147,14 @@ HostMatcher<Data, Result>::AllocateSpace(int num_entries)
   num_el    = 0;
 }
 
-// void HostMatcher<Data,Result>::Match(RequestData* rdata, Result* result)
+// void HostMatcher<Data,MatchResult>::Match(RequestData* rdata, MatchResult* result)
 //
 //  Searches our tree and updates argresult for each element matching
 //    arg hostname
 //
-template <class Data, class Result>
+template <class Data, class MatchResult>
 void
-HostMatcher<Data, Result>::Match(RequestData *rdata, Result *result)
+HostMatcher<Data, MatchResult>::Match(RequestData *rdata, MatchResult *result)
 {
   void *opaque_ptr;
   Data *data_ptr;
@@ -180,7 +180,7 @@ HostMatcher<Data, Result>::Match(RequestData *rdata, Result *result)
 }
 
 //
-// config_parse_error HostMatcher<Data,Result>::NewEntry(bool domain_record,
+// config_parse_error HostMatcher<Data,MatchResult>::NewEntry(bool domain_record,
 //          char* match_data, char* match_info, int line_num)
 //
 //   Creates a new host/domain record
@@ -189,9 +189,9 @@ HostMatcher<Data, Result>::Match(RequestData *rdata, Result *result)
 //   If not, returns a pointer to malloc allocated error string
 //     that the caller MUST DEALLOCATE
 //
-template <class Data, class Result>
+template <class Data, class MatchResult>
 config_parse_error
-HostMatcher<Data, Result>::NewEntry(matcher_line *line_info)
+HostMatcher<Data, MatchResult>::NewEntry(matcher_line *line_info)
 {
   Data *cur_d;
   config_parse_error error = config_parse_error::ok();
@@ -234,10 +234,10 @@ HostMatcher<Data, Result>::NewEntry(matcher_line *line_info)
  *************************************************************/
 
 //
-// UrlMatcher<Data,Result>::UrlMatcher()
+// UrlMatcher<Data,MatchResult>::UrlMatcher()
 //
-template <class Data, class Result>
-UrlMatcher<Data, Result>::UrlMatcher(const char *name, const char *filename)
+template <class Data, class MatchResult>
+UrlMatcher<Data, MatchResult>::UrlMatcher(const char *name, const char *filename)
   : url_ht(nullptr),
     url_str(nullptr),
     url_value(nullptr),
@@ -251,9 +251,9 @@ UrlMatcher<Data, Result>::UrlMatcher(const char *name, const char *filename)
 }
 
 //
-// UrlMatcher<Data,Result>::~UrlMatcher()
+// UrlMatcher<Data,MatchResult>::~UrlMatcher()
 //
-template <class Data, class Result> UrlMatcher<Data, Result>::~UrlMatcher()
+template <class Data, class MatchResult> UrlMatcher<Data, MatchResult>::~UrlMatcher()
 {
   ink_hash_table_destroy(url_ht);
   for (int i = 0; i < num_el; i++) {
@@ -265,13 +265,13 @@ template <class Data, class Result> UrlMatcher<Data, Result>::~UrlMatcher()
 }
 
 //
-// void UrlMatcher<Data,Result>::Print()
+// void UrlMatcher<Data,MatchResult>::Print()
 //
 //   Debugging function
 //
-template <class Data, class Result>
+template <class Data, class MatchResult>
 void
-UrlMatcher<Data, Result>::Print()
+UrlMatcher<Data, MatchResult>::Print()
 {
   printf("\tUrl Matcher with %d elements\n", num_el);
   for (int i = 0; i < num_el; i++) {
@@ -281,11 +281,11 @@ UrlMatcher<Data, Result>::Print()
 }
 
 //
-// void UrlMatcher<Data,Result>::AllocateSpace(int num_entries)
+// void UrlMatcher<Data,MatchResult>::AllocateSpace(int num_entries)
 //
-template <class Data, class Result>
+template <class Data, class MatchResult>
 void
-UrlMatcher<Data, Result>::AllocateSpace(int num_entries)
+UrlMatcher<Data, MatchResult>::AllocateSpace(int num_entries)
 {
   // Should not have been allocated before
   ink_assert(array_len == -1);
@@ -299,11 +299,11 @@ UrlMatcher<Data, Result>::AllocateSpace(int num_entries)
 }
 
 //
-// config_parse_error UrlMatcher<Data,Result>::NewEntry(matcher_line* line_info)
+// config_parse_error UrlMatcher<Data,MatchResult>::NewEntry(matcher_line* line_info)
 //
-template <class Data, class Result>
+template <class Data, class MatchResult>
 config_parse_error
-UrlMatcher<Data, Result>::NewEntry(matcher_line *line_info)
+UrlMatcher<Data, MatchResult>::NewEntry(matcher_line *line_info)
 {
   Data *cur_d;
   char *pattern;
@@ -344,14 +344,14 @@ UrlMatcher<Data, Result>::NewEntry(matcher_line *line_info)
 }
 
 //
-// void UrlMatcher<Data,Result>::Match(RD* rdata, Result* result)
+// void UrlMatcher<Data,MatchResult>::Match(RD* rdata, MatchResult* result)
 //
 //   Coduncts a linear search through the regex array and
 //     updates arg result for each regex that matches arg URL
 //
-template <class Data, class Result>
+template <class Data, class MatchResult>
 void
-UrlMatcher<Data, Result>::Match(RequestData *rdata, Result *result)
+UrlMatcher<Data, MatchResult>::Match(RequestData *rdata, MatchResult *result)
 {
   char *url_str;
   int *value;
@@ -379,18 +379,18 @@ UrlMatcher<Data, Result>::Match(RequestData *rdata, Result *result)
 }
 
 //
-// RegexMatcher<Data,Result>::RegexMatcher()
+// RegexMatcher<Data,MatchResult>::RegexMatcher()
 //
-template <class Data, class Result>
-RegexMatcher<Data, Result>::RegexMatcher(const char *name, const char *filename)
+template <class Data, class MatchResult>
+RegexMatcher<Data, MatchResult>::RegexMatcher(const char *name, const char *filename)
   : re_array(nullptr), re_str(nullptr), data_array(nullptr), array_len(-1), num_el(-1), matcher_name(name), file_name(filename)
 {
 }
 
 //
-// RegexMatcher<Data,Result>::~RegexMatcher()
+// RegexMatcher<Data,MatchResult>::~RegexMatcher()
 //
-template <class Data, class Result> RegexMatcher<Data, Result>::~RegexMatcher()
+template <class Data, class MatchResult> RegexMatcher<Data, MatchResult>::~RegexMatcher()
 {
   for (int i = 0; i < num_el; i++) {
     pcre_free(re_array[i]);
@@ -402,13 +402,13 @@ template <class Data, class Result> RegexMatcher<Data, Result>::~RegexMatcher()
 }
 
 //
-// void RegexMatcher<Data,Result>::Print()
+// void RegexMatcher<Data,MatchResult>::Print()
 //
 //   Debugging function
 //
-template <class Data, class Result>
+template <class Data, class MatchResult>
 void
-RegexMatcher<Data, Result>::Print()
+RegexMatcher<Data, MatchResult>::Print()
 {
   printf("\tRegex Matcher with %d elements\n", num_el);
   for (int i = 0; i < num_el; i++) {
@@ -418,11 +418,11 @@ RegexMatcher<Data, Result>::Print()
 }
 
 //
-// void RegexMatcher<Data,Result>::AllocateSpace(int num_entries)
+// void RegexMatcher<Data,MatchResult>::AllocateSpace(int num_entries)
 //
-template <class Data, class Result>
+template <class Data, class MatchResult>
 void
-RegexMatcher<Data, Result>::AllocateSpace(int num_entries)
+RegexMatcher<Data, MatchResult>::AllocateSpace(int num_entries)
 {
   // Should not have been allocated before
   ink_assert(array_len == -1);
@@ -440,11 +440,11 @@ RegexMatcher<Data, Result>::AllocateSpace(int num_entries)
 }
 
 //
-// config_parse_error RegexMatcher<Data,Result>::NewEntry(matcher_line* line_info)
+// config_parse_error RegexMatcher<Data,MatchResult>::NewEntry(matcher_line* line_info)
 //
-template <class Data, class Result>
+template <class Data, class MatchResult>
 config_parse_error
-RegexMatcher<Data, Result>::NewEntry(matcher_line *line_info)
+RegexMatcher<Data, MatchResult>::NewEntry(matcher_line *line_info)
 {
   Data *cur_d;
   char *pattern;
@@ -494,14 +494,14 @@ RegexMatcher<Data, Result>::NewEntry(matcher_line *line_info)
 }
 
 //
-// void RegexMatcher<Data,Result>::Match(RequestData* rdata, Result* result)
+// void RegexMatcher<Data,MatchResult>::Match(RequestData* rdata, MatchResult* result)
 //
 //   Coduncts a linear search through the regex array and
 //     updates arg result for each regex that matches arg URL
 //
-template <class Data, class Result>
+template <class Data, class MatchResult>
 void
-RegexMatcher<Data, Result>::Match(RequestData *rdata, Result *result)
+RegexMatcher<Data, MatchResult>::Match(RequestData *rdata, MatchResult *result)
 {
   char *url_str;
   int r;
@@ -538,23 +538,23 @@ RegexMatcher<Data, Result>::Match(RequestData *rdata, Result *result)
 }
 
 //
-// HostRegexMatcher<Data,Result>::HostRegexMatcher()
+// HostRegexMatcher<Data,MatchResult>::HostRegexMatcher()
 //
-template <class Data, class Result>
-HostRegexMatcher<Data, Result>::HostRegexMatcher(const char *name, const char *filename)
-  : RegexMatcher<Data, Result>(name, filename)
+template <class Data, class MatchResult>
+HostRegexMatcher<Data, MatchResult>::HostRegexMatcher(const char *name, const char *filename)
+  : RegexMatcher<Data, MatchResult>(name, filename)
 {
 }
 
 //
-// void HostRegexMatcher<Data,Result>::Match(RequestData* rdata, Result* result)
+// void HostRegexMatcher<Data,MatchResult>::Match(RequestData* rdata, MatchResult* result)
 //
 //   Conducts a linear search through the regex array and
 //     updates arg result for each regex that matches arg host_regex
 //
-template <class Data, class Result>
+template <class Data, class MatchResult>
 void
-HostRegexMatcher<Data, Result>::Match(RequestData *rdata, Result *result)
+HostRegexMatcher<Data, MatchResult>::Match(RequestData *rdata, MatchResult *result)
 {
   const char *url_str;
   int r;
@@ -586,28 +586,28 @@ HostRegexMatcher<Data, Result>::Match(RequestData *rdata, Result *result)
 }
 
 //
-// IpMatcher<Data,Result>::IpMatcher()
+// IpMatcher<Data,MatchResult>::IpMatcher()
 //
-template <class Data, class Result>
-IpMatcher<Data, Result>::IpMatcher(const char *name, const char *filename)
+template <class Data, class MatchResult>
+IpMatcher<Data, MatchResult>::IpMatcher(const char *name, const char *filename)
   : data_array(nullptr), array_len(-1), num_el(-1), matcher_name(name), file_name(filename)
 {
 }
 
 //
-// IpMatcher<Data,Result>::~IpMatcher()
+// IpMatcher<Data,MatchResult>::~IpMatcher()
 //
-template <class Data, class Result> IpMatcher<Data, Result>::~IpMatcher()
+template <class Data, class MatchResult> IpMatcher<Data, MatchResult>::~IpMatcher()
 {
   delete[] data_array;
 }
 
 //
-// void IpMatcher<Data,Result>::AllocateSpace(int num_entries)
+// void IpMatcher<Data,MatchResult>::AllocateSpace(int num_entries)
 //
-template <class Data, class Result>
+template <class Data, class MatchResult>
 void
-IpMatcher<Data, Result>::AllocateSpace(int num_entries)
+IpMatcher<Data, MatchResult>::AllocateSpace(int num_entries)
 {
   // Should not have been allocated before
   ink_assert(array_len == -1);
@@ -619,7 +619,7 @@ IpMatcher<Data, Result>::AllocateSpace(int num_entries)
 }
 
 //
-// config_parse_error IpMatcher<Data,Result>::NewEntry(matcher_line* line_info)
+// config_parse_error IpMatcher<Data,MatchResult>::NewEntry(matcher_line* line_info)
 //
 //    Inserts a range the ip lookup table.
 //        Creates new table levels as needed
@@ -628,9 +628,9 @@ IpMatcher<Data, Result>::AllocateSpace(int num_entries)
 //     allocated error string which the CALLEE is responsible
 //     for deallocating
 //
-template <class Data, class Result>
+template <class Data, class MatchResult>
 config_parse_error
-IpMatcher<Data, Result>::NewEntry(matcher_line *line_info)
+IpMatcher<Data, MatchResult>::NewEntry(matcher_line *line_info)
 {
   Data *cur_d;
   const char *errptr;
@@ -673,11 +673,11 @@ IpMatcher<Data, Result>::NewEntry(matcher_line *line_info)
 }
 
 //
-// void IpMatcherData,Result>::Match(in_addr_t addr, RequestData* rdata, Result* result)
+// void IpMatcherData,MatchResult>::Match(in_addr_t addr, RequestData* rdata, MatchResult* result)
 //
-template <class Data, class Result>
+template <class Data, class MatchResult>
 void
-IpMatcher<Data, Result>::Match(sockaddr const *addr, RequestData *rdata, Result *result)
+IpMatcher<Data, MatchResult>::Match(sockaddr const *addr, RequestData *rdata, MatchResult *result)
 {
   void *raw;
   if (ip_map.contains(addr, &raw)) {
@@ -687,9 +687,9 @@ IpMatcher<Data, Result>::Match(sockaddr const *addr, RequestData *rdata, Result
   }
 }
 
-template <class Data, class Result>
+template <class Data, class MatchResult>
 void
-IpMatcher<Data, Result>::Print()
+IpMatcher<Data, MatchResult>::Print()
 {
   printf("\tIp Matcher with %d elements, %zu ranges.\n", num_el, ip_map.getCount());
   for (IpMap::iterator spot(ip_map.begin()), limit(ip_map.end()); spot != limit; ++spot) {
@@ -699,8 +699,8 @@ IpMatcher<Data, Result>::Print()
   }
 }
 
-template <class Data, class Result>
-ControlMatcher<Data, Result>::ControlMatcher(const char *file_var, const char *name, const matcher_tags *tags, int flags_in)
+template <class Data, class MatchResult>
+ControlMatcher<Data, MatchResult>::ControlMatcher(const char *file_var, const char *name, const matcher_tags *tags, int flags_in)
 {
   flags = flags_in;
   ink_assert(flags & (ALLOW_HOST_TABLE | ALLOW_REGEX_TABLE | ALLOW_URL_TABLE | ALLOW_IP_TABLE));
@@ -731,7 +731,7 @@ ControlMatcher<Data, Result>::ControlMatcher(const char *file_var, const char *n
   }
 }
 
-template <class Data, class Result> ControlMatcher<Data, Result>::~ControlMatcher()
+template <class Data, class MatchResult> ControlMatcher<Data, MatchResult>::~ControlMatcher()
 {
   delete reMatch;
   delete urlMatch;
@@ -740,13 +740,13 @@ template <class Data, class Result> ControlMatcher<Data, Result>::~ControlMatche
   delete hrMatch;
 }
 
-// void ControlMatcher<Data, Result>::Print()
+// void ControlMatcher<Data, MatchResult>::Print()
 //
 //   Debugging method
 //
-template <class Data, class Result>
+template <class Data, class MatchResult>
 void
-ControlMatcher<Data, Result>::Print()
+ControlMatcher<Data, MatchResult>::Print()
 {
   printf("Control Matcher Table: %s\n", matcher_name);
   if (hostMatch != nullptr) {
@@ -766,14 +766,14 @@ ControlMatcher<Data, Result>::Print()
   }
 }
 
-// void ControlMatcher<Data, Result>::Match(RequestData* rdata
-//                                          Result* result)
+// void ControlMatcher<Data, MatchResult>::Match(RequestData* rdata
+//                                          MatchResult* result)
 //
-//   Queries each table for the Result*
+//   Queries each table for the MatchResult*
 //
-template <class Data, class Result>
+template <class Data, class MatchResult>
 void
-ControlMatcher<Data, Result>::Match(RequestData *rdata, Result *result)
+ControlMatcher<Data, MatchResult>::Match(RequestData *rdata, MatchResult *result)
 {
   if (hostMatch != nullptr) {
     hostMatch->Match(rdata, result);
@@ -797,9 +797,9 @@ ControlMatcher<Data, Result>::Match(RequestData *rdata, Result *result)
 //    Reads the cache.config file and build the records array
 //      from it
 //
-template <class Data, class Result>
+template <class Data, class MatchResult>
 int
-ControlMatcher<Data, Result>::BuildTableFromString(char *file_buf)
+ControlMatcher<Data, MatchResult>::BuildTableFromString(char *file_buf)
 {
   // Table build locals
   Tokenizer bufTok("\n");
@@ -893,27 +893,27 @@ ControlMatcher<Data, Result>::BuildTableFromString(char *file_buf)
   }
   // Now allocate space for the record pointers
   if ((flags & ALLOW_REGEX_TABLE) && regex > 0) {
-    reMatch = new RegexMatcher<Data, Result>(matcher_name, config_file_path);
+    reMatch = new RegexMatcher<Data, MatchResult>(matcher_name, config_file_path);
     reMatch->AllocateSpace(regex);
   }
 
   if ((flags & ALLOW_URL_TABLE) && url > 0) {
-    urlMatch = new UrlMatcher<Data, Result>(matcher_name, config_file_path);
+    urlMatch = new UrlMatcher<Data, MatchResult>(matcher_name, config_file_path);
     urlMatch->AllocateSpace(url);
   }
 
   if ((flags & ALLOW_HOST_TABLE) && hostDomain > 0) {
-    hostMatch = new HostMatcher<Data, Result>(matcher_name, config_file_path);
+    hostMatch = new HostMatcher<Data, MatchResult>(matcher_name, config_file_path);
     hostMatch->AllocateSpace(hostDomain);
   }
 
   if ((flags & ALLOW_IP_TABLE) && ip > 0) {
-    ipMatch = new IpMatcher<Data, Result>(matcher_name, config_file_path);
+    ipMatch = new IpMatcher<Data, MatchResult>(matcher_name, config_file_path);
     ipMatch->AllocateSpace(ip);
   }
 
   if ((flags & ALLOW_HOST_REGEX_TABLE) && hostregex > 0) {
-    hrMatch = new HostRegexMatcher<Data, Result>(matcher_name, config_file_path);
+    hrMatch = new HostRegexMatcher<Data, MatchResult>(matcher_name, config_file_path);
     hrMatch->AllocateSpace(hostregex);
   }
   // Traverse the list and build the records table
@@ -959,9 +959,9 @@ ControlMatcher<Data, Result>::BuildTableFromString(char *file_buf)
   return numEntries;
 }
 
-template <class Data, class Result>
+template <class Data, class MatchResult>
 int
-ControlMatcher<Data, Result>::BuildTable()
+ControlMatcher<Data, MatchResult>::BuildTable()
 {
   // File I/O Locals
   char *file_buf;
diff --git a/proxy/ControlMatcher.h b/proxy/ControlMatcher.h
index 9d7a530..0501dbb 100644
--- a/proxy/ControlMatcher.h
+++ b/proxy/ControlMatcher.h
@@ -165,12 +165,12 @@ public:
   URL **cache_info_parent_selection_url;
 };
 
-template <class Data, class Result> class UrlMatcher
+template <class Data, class MatchResult> class UrlMatcher
 {
 public:
   UrlMatcher(const char *name, const char *filename);
   ~UrlMatcher();
-  void Match(RequestData *rdata, Result *result);
+  void Match(RequestData *rdata, MatchResult *result);
   void AllocateSpace(int num_entries);
   config_parse_error NewEntry(matcher_line *line_info);
   void Print();
@@ -197,12 +197,12 @@ protected:
   const char *file_name;    // Used for Debug/Warning/Error messages
 };
 
-template <class Data, class Result> class RegexMatcher
+template <class Data, class MatchResult> class RegexMatcher
 {
 public:
   RegexMatcher(const char *name, const char *filename);
   ~RegexMatcher();
-  void Match(RequestData *rdata, Result *result);
+  void Match(RequestData *rdata, MatchResult *result);
   void AllocateSpace(int num_entries);
   config_parse_error NewEntry(matcher_line *line_info);
   void Print();
@@ -228,19 +228,19 @@ protected:
   const char *file_name;    // Used for Debug/Warning/Error messages
 };
 
-template <class Data, class Result> class HostRegexMatcher : public RegexMatcher<Data, Result>
+template <class Data, class MatchResult> class HostRegexMatcher : public RegexMatcher<Data, MatchResult>
 {
 public:
   HostRegexMatcher(const char *name, const char *filename);
-  void Match(RequestData *rdata, Result *result);
+  void Match(RequestData *rdata, MatchResult *result);
 };
 
-template <class Data, class Result> class HostMatcher
+template <class Data, class MatchResult> class HostMatcher
 {
 public:
   HostMatcher(const char *name, const char *filename);
   ~HostMatcher();
-  void Match(RequestData *rdata, Result *result);
+  void Match(RequestData *rdata, MatchResult *result);
   void AllocateSpace(int num_entries);
   config_parse_error NewEntry(matcher_line *line_info);
   void Print();
@@ -271,12 +271,12 @@ private:
   const char *file_name;    // Used for Debug/Warning/Error messages
 };
 
-template <class Data, class Result> class IpMatcher
+template <class Data, class MatchResult> class IpMatcher
 {
 public:
   IpMatcher(const char *name, const char *filename);
   ~IpMatcher();
-  void Match(sockaddr const *ip_addr, RequestData *rdata, Result *result);
+  void Match(sockaddr const *ip_addr, RequestData *rdata, MatchResult *result);
   void AllocateSpace(int num_entries);
   config_parse_error NewEntry(matcher_line *line_info);
   void Print();
@@ -308,7 +308,7 @@ public:
 #define ALLOW_URL_TABLE 1 << 4
 #define DONT_BUILD_TABLE 1 << 5 // for testing
 
-template <class Data, class Result> class ControlMatcher
+template <class Data, class MatchResult> class ControlMatcher
 {
 public:
   // Parameter name must not be deallocated before this
@@ -318,7 +318,7 @@ public:
   ~ControlMatcher();
   int BuildTable();
   int BuildTableFromString(char *str);
-  void Match(RequestData *rdata, Result *result);
+  void Match(RequestData *rdata, MatchResult *result);
   void Print();
 
   int
@@ -326,38 +326,38 @@ public:
   {
     return m_numEntries;
   }
-  HostMatcher<Data, Result> *
+  HostMatcher<Data, MatchResult> *
   getHostMatcher()
   {
     return hostMatch;
   }
-  RegexMatcher<Data, Result> *
+  RegexMatcher<Data, MatchResult> *
   getReMatcher()
   {
     return reMatch;
   }
-  UrlMatcher<Data, Result> *
+  UrlMatcher<Data, MatchResult> *
   getUrlMatcher()
   {
     return urlMatch;
   }
-  IpMatcher<Data, Result> *
+  IpMatcher<Data, MatchResult> *
   getIPMatcher()
   {
     return ipMatch;
   }
-  HostRegexMatcher<Data, Result> *
+  HostRegexMatcher<Data, MatchResult> *
   getHrMatcher()
   {
     return hrMatch;
   }
 
   // private:
-  RegexMatcher<Data, Result> *reMatch;
-  UrlMatcher<Data, Result> *urlMatch;
-  HostMatcher<Data, Result> *hostMatch;
-  IpMatcher<Data, Result> *ipMatch;
-  HostRegexMatcher<Data, Result> *hrMatch;
+  RegexMatcher<Data, MatchResult> *reMatch;
+  UrlMatcher<Data, MatchResult> *urlMatch;
+  HostMatcher<Data, MatchResult> *hostMatch;
+  IpMatcher<Data, MatchResult> *ipMatch;
+  HostRegexMatcher<Data, MatchResult> *hrMatch;
   const matcher_tags *config_tags;
   char config_file_path[PATH_NAME_MAX];
   int flags;

-- 
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>.