Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(61)

Unified Diff: ui/gfx/text_elider.cc

Issue 681123006: Fix a 'type-limits' warning in StringSlicer::FindValidBoundaryAfter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/text_elider.cc
diff --git a/ui/gfx/text_elider.cc b/ui/gfx/text_elider.cc
index 1bf85d4936761a22cf3351c4fa0e871abbf518bd..d21c211e3fb5e0137f87678191af235c9a382bdc 100644
--- a/ui/gfx/text_elider.cc
+++ b/ui/gfx/text_elider.cc
@@ -145,10 +145,17 @@ size_t StringSlicer::FindValidBoundaryBefore(size_t index) const {
}
size_t StringSlicer::FindValidBoundaryAfter(size_t index) const {
+#if defined(__GNUC__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wtype-limits"
+#endif
Peter Kasting 2014/10/29 17:08:00 Definitely don't fix the warning this way -- the r
DCHECK_LE(index, text_.length());
if (index != text_.length())
U16_SET_CP_LIMIT(text_.data(), 0, index, text_.length());
return index;
+#if defined(__GCC__)
+#pragma GCC diagnostic pop
+#endif
}
base::string16 ElideFilename(const base::FilePath& filename,
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698