diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-03 03:53:35 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-03 03:53:35 +0000 |
| commit | 07f1ceeabc0cf63ed8d7ae7aa8d1ff04dda02584 (patch) | |
| tree | 0fa72c2ed2d771f492a2ec068d3137722220cbc5 /net/base | |
| parent | d019f6ef8b3e225cb912291e5aebf9a295f42a23 (diff) | |
| download | chromium_src-07f1ceeabc0cf63ed8d7ae7aa8d1ff04dda02584.zip chromium_src-07f1ceeabc0cf63ed8d7ae7aa8d1ff04dda02584.tar.gz chromium_src-07f1ceeabc0cf63ed8d7ae7aa8d1ff04dda02584.tar.bz2 | |
base: Move CaseInsensitiveCompare traits into the base namespace.
This should fix conflicts like:
2>d:\src\chromium_src2\src\base/string_util.h(480) : error C2904: 'CaseInsensitiveCompare' : name already used for a template in the current scope
2> d:\src\chromium_src2\src\third_party\xulrunner-sdk\win\include\xpcom\nsStringAPI.h(1406) : see declaration of 'CaseInsensitiveCompare'
Reported-by: Jeff Timanus <twiz@google.com>
BUG=None
TEST=trybots
Review URL: http://codereview.chromium.org/4366001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64877 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base')
| -rw-r--r-- | net/base/net_util.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/base/net_util.cc b/net/base/net_util.cc index 8f6b2af..550a939 100644 --- a/net/base/net_util.cc +++ b/net/base/net_util.cc @@ -176,7 +176,7 @@ STR GetSpecificHeaderT(const STR& headers, const STR& name) { typename STR::const_iterator begin = search(headers.begin(), headers.end(), match.begin(), match.end(), - CaseInsensitiveCompareASCII<typename STR::value_type>()); + base::CaseInsensitiveCompareASCII<typename STR::value_type>()); if (begin == headers.end()) return STR(); @@ -424,7 +424,7 @@ STR GetHeaderParamValueT(const STR& header, const STR& param_name) { // This assumes args are formatted exactly like "bla; arg1=value; arg2=value". typename STR::const_iterator param_begin = search(header.begin(), header.end(), param_name.begin(), param_name.end(), - CaseInsensitiveCompareASCII<typename STR::value_type>()); + base::CaseInsensitiveCompareASCII<typename STR::value_type>()); if (param_begin == header.end()) return STR(); |