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 cbe3cde..6718112 100644
--- a/include/clang/Basic/FileManager.h
+++ b/include/clang/Basic/FileManager.h
@@ -64,7 +64,6 @@
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 14f762e..359e192 100644
--- 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