diff --git a/include/llvm/ADT/StringRef.h b/include/llvm/ADT/StringRef.h
index 14efb824a8b..3064af3abbc 100644
--- a/include/llvm/ADT/StringRef.h
+++ b/include/llvm/ADT/StringRef.h
@@ -29,6 +29,7 @@ namespace llvm {
   class StringRef {
   public:
     typedef const char *iterator;
+    typedef const char *const_iterator;
     static const size_t npos = ~size_t(0);
     typedef size_t size_type;
 
@@ -42,15 +43,8 @@ namespace llvm {
     // Workaround PR5482: nearly all gcc 4.x miscompile StringRef and std::min()
     // Changing the arg of min to be an integer, instead of a reference to an
     // integer works around this bug.
-    size_t min(size_t a, size_t b) const
-    {
-      return a < b ? a : b;
-    }
-
-    size_t max(size_t a, size_t b) const
-    {
-      return a > b ? a : b;
-    }
+    size_t min(size_t a, size_t b) const { return a < b ? a : b; }
+    size_t max(size_t a, size_t b) const { return a > b ? a : b; }
 
   public:
     /// @name Constructors