summaryrefslogtreecommitdiffstats
path: root/base/string_util.cc
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-03 03:53:35 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-03 03:53:35 +0000
commit07f1ceeabc0cf63ed8d7ae7aa8d1ff04dda02584 (patch)
tree0fa72c2ed2d771f492a2ec068d3137722220cbc5 /base/string_util.cc
parentd019f6ef8b3e225cb912291e5aebf9a295f42a23 (diff)
downloadchromium_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 'base/string_util.cc')
-rw-r--r--base/string_util.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/base/string_util.cc b/base/string_util.cc
index b242329..fd8438a 100644
--- a/base/string_util.cc
+++ b/base/string_util.cc
@@ -568,7 +568,7 @@ bool StartsWithT(const STR& str, const STR& search, bool case_sensitive) {
if (search.size() > str.size())
return false;
return std::equal(search.begin(), search.end(), str.begin(),
- CaseInsensitiveCompare<typename STR::value_type>());
+ base::CaseInsensitiveCompare<typename STR::value_type>());
}
}
@@ -595,7 +595,7 @@ bool EndsWithT(const STR& str, const STR& search, bool case_sensitive) {
} else {
return std::equal(search.begin(), search.end(),
str.begin() + (str_length - search_length),
- CaseInsensitiveCompare<typename STR::value_type>());
+ base::CaseInsensitiveCompare<typename STR::value_type>());
}
}