commit 0d31d9c012797a50ed99ff0b1e77ff38f1cf94d1
author Zachary Turner <zturner@google.com> Mon Oct 17 23:08:47 2016 +0000
committer Zachary Turner <zturner@google.com> Mon Oct 17 23:08:47 2016 +0000
tree 1acfcae15b404e356a9582f6b035dd1a404ae839
parent 7cd0745c95f1fd9353532be1d0073915e0cacce2

Rename HexStyle -> HexFormatStyle, and remove a constexpr.

This should fix the remaining broken builds.

llvm-svn: 284437

llvm/lib/Support/raw_ostream.cpp

diff --git a/llvm/lib/Support/raw_ostream.cpp b/llvm/lib/Support/raw_ostream.cpp
index 3bf6b93..eb89535 100644
--- a/llvm/lib/Support/raw_ostream.cpp
+++ b/llvm/lib/Support/raw_ostream.cpp
@@ -134,7 +134,7 @@
 }
 
 raw_ostream &raw_ostream::write_hex(unsigned long long N) {
-  llvm::write_hex(*this, N, HexStyle::Lower);
+  llvm::write_hex(*this, N, HexPrintStyle::Lower);
   return *this;
 }
 
@@ -179,7 +179,7 @@
 }
 
 raw_ostream &raw_ostream::operator<<(const void *P) {
-  llvm::write_hex(*this, (uintptr_t)P, HexStyle::PrefixLower);
+  llvm::write_hex(*this, (uintptr_t)P, HexPrintStyle::PrefixLower);
   return *this;
 }
 
@@ -331,15 +331,15 @@
 
 raw_ostream &raw_ostream::operator<<(const FormattedNumber &FN) {
   if (FN.Hex) {
-    HexStyle Style;
+    HexPrintStyle Style;
     if (FN.Upper && FN.HexPrefix)
-      Style = HexStyle::PrefixUpper;
+      Style = HexPrintStyle::PrefixUpper;
     else if (FN.Upper && !FN.HexPrefix)
-      Style = HexStyle::Upper;
+      Style = HexPrintStyle::Upper;
     else if (!FN.Upper && FN.HexPrefix)
-      Style = HexStyle::PrefixLower;
+      Style = HexPrintStyle::PrefixLower;
     else
-      Style = HexStyle::Lower;
+      Style = HexPrintStyle::Lower;
     llvm::write_hex(*this, FN.HexValue, Style, FN.Width, None);
   } else {
     llvm::write_integer(*this, FN.DecValue, IntegerStyle::Integer, None,