Fix 2 problems with Chris Lattner's FileManager redesign on Windows.

- FileEntry::operator= is needed on Win32.
- There was an error in the S_ISDIR() macro.

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

diff --git a/include/clang/Basic/FileManager.h b/include/clang/Basic/FileManager.h
index cbe3cde65aa2c7b64ede951677a93f2d60d912ad..6718112d13359432cde6e2176d8742e0b229ebd0 100644 (file)
--- a/include/clang/Basic/FileManager.h
+++ b/include/clang/Basic/FileManager.h
@@ -64,7 +64,6 @@ class FileEntry {
   mutable int FD;
   friend class FileManager;
   
-  void operator=(const FileEntry&); // DO NOT IMPLEMENT.
 public:
   FileEntry(dev_t device, ino_t inode, mode_t m)
     : Name(0), Device(device), Inode(inode), FileMode(m), FD(-1) {}

diff --git a/lib/Basic/FileSystemStatCache.cpp b/lib/Basic/FileSystemStatCache.cpp
index 14f762e9887219057a2ebc6104f45d4440d920f5..359e1924d00952dcc86b0055a7cb35535e6d7b36 100644 (file)
--- a/lib/Basic/FileSystemStatCache.cpp
+++ b/lib/Basic/FileSystemStatCache.cpp
@@ -25,7 +25,7 @@
 using namespace clang;
 
 #if defined(_MSC_VER)
-#define S_ISDIR(s) (_S_IFDIR & s)
+#define S_ISDIR(s) ((_S_IFDIR & s) !=0)
 #endif
 
 /// FileSystemStatCache::get - Get the 'stat' information for the specified