For PR1291:

Change to use PathWithStatus

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

diff --git a/include/llvm/Bytecode/Archive.h b/include/llvm/Bytecode/Archive.h
index d0a72561e416f3bc62be04cc36611eae9b30ceb1..f871a990b4b2b0f02b174a10a572acbb998e1581 100644 (file)
--- a/include/llvm/Bytecode/Archive.h
+++ b/include/llvm/Bytecode/Archive.h
@@ -190,13 +190,13 @@ class ArchiveMember {
   /// @name Data
   /// @{
   private:
-    ArchiveMember* next;        ///< Pointer to next archive member
-    ArchiveMember* prev;        ///< Pointer to previous archive member
-    Archive*       parent;      ///< Pointer to parent archive
-    sys::Path      path;        ///< Path of file containing the member
-    sys::FileStatus info;       ///< Status info (size,mode,date)
-    unsigned       flags;       ///< Flags about the archive member
-    const void*    data;        ///< Data for the member
+    ArchiveMember*      next;     ///< Pointer to next archive member
+    ArchiveMember*      prev;     ///< Pointer to previous archive member
+    Archive*            parent;   ///< Pointer to parent archive
+    sys::PathWithStatus path;     ///< Path of file containing the member
+    sys::FileStatus     info;     ///< Status info (size,mode,date)
+    unsigned            flags;    ///< Flags about the archive member
+    const void*         data;     ///< Data for the member
 
   /// @}
   /// @name Constructors

diff --git a/include/llvm/Support/FileUtilities.h b/include/llvm/Support/FileUtilities.h
index d0d193deb957f6d82fde5040d320833672ce6e3d..9cebe23862379f1f63ffcd1e13df0ed45ef2370e 100644 (file)
--- a/include/llvm/Support/FileUtilities.h
+++ b/include/llvm/Support/FileUtilities.h
@@ -26,7 +26,8 @@ namespace llvm {
   /// option, it will set the string to an error message if an error occurs, or
   /// if the files are different.
   ///
-  int DiffFilesWithTolerance(const sys::Path &FileA, const sys::Path &FileB,
+  int DiffFilesWithTolerance(const sys::PathWithStatus &FileA, 
+                             const sys::PathWithStatus &FileB,
                              double AbsTol, double RelTol,
                              std::string *Error = 0);