r321615 - Add scope specifiers to updated scoped-enums (that I somehow missed in r321614)

[Faisal Vali via cfe-commits]

Author: faisalv
Date: Sun Dec 31 18:35:43 2017
New Revision: 321615

URL: http://llvm.org/viewvc/llvm-project?rev=321615&view=rev
Log:
Add scope specifiers to updated scoped-enums (that I somehow missed in r321614)

Modified:
    cfe/trunk/lib/AST/TypeLoc.cpp
    cfe/trunk/lib/Serialization/ASTWriter.cpp

Modified: cfe/trunk/lib/AST/TypeLoc.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/TypeLoc.cpp?rev=321615&r1=321614&r2=321615&view=diff
==============================================================================
--- cfe/trunk/lib/AST/TypeLoc.cpp (original)
+++ cfe/trunk/lib/AST/TypeLoc.cpp Sun Dec 31 18:35:43 2017
@@ -311,19 +311,19 @@ TypeSpecifierType BuiltinTypeLoc::getWri
     return static_cast<TypeSpecifierType>(getWrittenBuiltinSpecs().Type);
   switch (getTypePtr()->getKind()) {
   case BuiltinType::Void:
-    return TST_void;
+    return TypeSpecifierType::TST_void;
   case BuiltinType::Bool:
-    return TST_bool;
+    return TypeSpecifierType::TST_bool;
   case BuiltinType::Char_U:
   case BuiltinType::Char_S:
-    return TST_char;
+    return TypeSpecifierType::TST_char;
   case BuiltinType::Char16:
-    return TST_char16;
+    return TypeSpecifierType::TST_char16;
   case BuiltinType::Char32:
-    return TST_char32;
+    return TypeSpecifierType::TST_char32;
   case BuiltinType::WChar_S:
   case BuiltinType::WChar_U:
-    return TST_wchar;
+    return TypeSpecifierType::TST_wchar;
   case BuiltinType::UChar:
   case BuiltinType::UShort:
   case BuiltinType::UInt:
@@ -365,7 +365,7 @@ TypeSpecifierType BuiltinTypeLoc::getWri
   case BuiltinType::OCLReserveID:
   case BuiltinType::BuiltinFn:
   case BuiltinType::OMPArraySection:
-    return TST_unspecified;
+    return TypeSpecifierType::TST_unspecified;
   }
 
   llvm_unreachable("Invalid BuiltinType Kind!");

Modified: cfe/trunk/lib/Serialization/ASTWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTWriter.cpp?rev=321615&r1=321614&r2=321615&view=diff
==============================================================================
--- cfe/trunk/lib/Serialization/ASTWriter.cpp (original)
+++ cfe/trunk/lib/Serialization/ASTWriter.cpp Sun Dec 31 18:35:43 2017
@@ -590,9 +590,9 @@ void TypeLocWriter::VisitQualifiedTypeLo
 void TypeLocWriter::VisitBuiltinTypeLoc(BuiltinTypeLoc TL) {
   Record.AddSourceLocation(TL.getBuiltinLoc());
   if (TL.needsExtraLocalData()) {
-    Record.push_back(TL.getWrittenTypeSpec());
-    Record.push_back(TL.getWrittenSignSpec());
-    Record.push_back(TL.getWrittenWidthSpec());
+    Record.push_back(static_cast<int>(TL.getWrittenTypeSpec()));
+    Record.push_back(static_cast<int>(TL.getWrittenSignSpec()));
+    Record.push_back(static_cast<int>(TL.getWrittenWidthSpec()));
     Record.push_back(TL.hasModeAttr());
   }
 }