For PR1302:

Adjust useage of sys::Path::FileType for new enumerator names.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@35651 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Archive/Archive.cpp b/lib/Archive/Archive.cpp
index f9fa80748bcc8360b41185eb000f5170ee1f6868..d594a8715f7a4de6d589076f67d1f75167a405ae 100644 (file)
--- a/lib/Archive/Archive.cpp
+++ b/lib/Archive/Archive.cpp
@@ -125,10 +125,10 @@ bool ArchiveMember::replaceWith(const sys::Path& newFile, std::string* ErrMsg) {
 
   // Determine what kind of file it is
   switch (sys::IdentifyFileType(signature,4)) {
-    case sys::BytecodeFileType:
+    case sys::Bytecode_FileType:
       flags |= BytecodeFlag;
       break;
-    case sys::CompressedBytecodeFileType:
+    case sys::CompressedBytecode_FileType:
       flags |= CompressedBytecodeFlag;
       flags &= ~CompressedFlag;
       break;

diff --git a/lib/Archive/ArchiveReader.cpp b/lib/Archive/ArchiveReader.cpp
index 67b6549e15ee0a9cfd50ee61325c8e281d009db3..58b1e20ca645c9d4a98184bf08f6fa2e564d3caf 100644 (file)
--- a/lib/Archive/ArchiveReader.cpp
+++ b/lib/Archive/ArchiveReader.cpp
@@ -205,10 +205,10 @@ Archive::parseMemberHeader(const char*& At, const char* End, std::string* error)
 
   // Determine if this is a bytecode file
   switch (sys::IdentifyFileType(At, 4)) {
-    case sys::BytecodeFileType:
+    case sys::Bytecode_FileType:
       flags |= ArchiveMember::BytecodeFlag;
       break;
-    case sys::CompressedBytecodeFileType:
+    case sys::CompressedBytecode_FileType:
       flags |= ArchiveMember::CompressedBytecodeFlag;
       flags &= ~ArchiveMember::CompressedFlag;
       break;

diff --git a/lib/Archive/ArchiveWriter.cpp b/lib/Archive/ArchiveWriter.cpp
index fc85374c02090241a6588c31787a471903deb61f..b8e3280c12507e9d459fbbfa8cef9b10665be137 100644 (file)
--- a/lib/Archive/ArchiveWriter.cpp
+++ b/lib/Archive/ArchiveWriter.cpp
@@ -178,10 +178,10 @@ Archive::addFileBefore(const sys::Path& filePath, iterator where,
   std::string magic;
   mbr->path.getMagicNumber(magic,4);
   switch (sys::IdentifyFileType(magic.c_str(),4)) {
-    case sys::BytecodeFileType:
+    case sys::Bytecode_FileType:
       flags |= ArchiveMember::BytecodeFlag;
       break;
-    case sys::CompressedBytecodeFileType:
+    case sys::CompressedBytecode_FileType:
       flags |= ArchiveMember::CompressedBytecodeFlag;
       break;
     default:

diff --git a/lib/Bytecode/Archive/Archive.cpp b/lib/Bytecode/Archive/Archive.cpp
index f9fa80748bcc8360b41185eb000f5170ee1f6868..d594a8715f7a4de6d589076f67d1f75167a405ae 100644 (file)
--- a/lib/Bytecode/Archive/Archive.cpp
+++ b/lib/Bytecode/Archive/Archive.cpp
@@ -125,10 +125,10 @@ bool ArchiveMember::replaceWith(const sys::Path& newFile, std::string* ErrMsg) {
 
   // Determine what kind of file it is
   switch (sys::IdentifyFileType(signature,4)) {
-    case sys::BytecodeFileType:
+    case sys::Bytecode_FileType:
       flags |= BytecodeFlag;
       break;
-    case sys::CompressedBytecodeFileType:
+    case sys::CompressedBytecode_FileType:
       flags |= CompressedBytecodeFlag;
       flags &= ~CompressedFlag;
       break;

diff --git a/lib/Bytecode/Archive/ArchiveReader.cpp b/lib/Bytecode/Archive/ArchiveReader.cpp
index 67b6549e15ee0a9cfd50ee61325c8e281d009db3..58b1e20ca645c9d4a98184bf08f6fa2e564d3caf 100644 (file)
--- a/lib/Bytecode/Archive/ArchiveReader.cpp
+++ b/lib/Bytecode/Archive/ArchiveReader.cpp
@@ -205,10 +205,10 @@ Archive::parseMemberHeader(const char*& At, const char* End, std::string* error)
 
   // Determine if this is a bytecode file
   switch (sys::IdentifyFileType(At, 4)) {
-    case sys::BytecodeFileType:
+    case sys::Bytecode_FileType:
       flags |= ArchiveMember::BytecodeFlag;
       break;
-    case sys::CompressedBytecodeFileType:
+    case sys::CompressedBytecode_FileType:
       flags |= ArchiveMember::CompressedBytecodeFlag;
       flags &= ~ArchiveMember::CompressedFlag;
       break;

diff --git a/lib/Bytecode/Archive/ArchiveWriter.cpp b/lib/Bytecode/Archive/ArchiveWriter.cpp
index fc85374c02090241a6588c31787a471903deb61f..b8e3280c12507e9d459fbbfa8cef9b10665be137 100644 (file)
--- a/lib/Bytecode/Archive/ArchiveWriter.cpp
+++ b/lib/Bytecode/Archive/ArchiveWriter.cpp
@@ -178,10 +178,10 @@ Archive::addFileBefore(const sys::Path& filePath, iterator where,
   std::string magic;
   mbr->path.getMagicNumber(magic,4);
   switch (sys::IdentifyFileType(magic.c_str(),4)) {
-    case sys::BytecodeFileType:
+    case sys::Bytecode_FileType:
       flags |= ArchiveMember::BytecodeFlag;
       break;
-    case sys::CompressedBytecodeFileType:
+    case sys::CompressedBytecode_FileType:
       flags |= ArchiveMember::CompressedBytecodeFlag;
       break;
     default: