diff options
| author | Francois Pichet <pichet2000@gmail.com> | 2010-11-24 03:07:43 +0000 |
|---|---|---|
| committer | Francois Pichet <pichet2000@gmail.com> | 2010-11-24 03:07:43 +0000 |
| commit | 0d4739abf60372abdbafabd8ed59acc5d01729b5 (patch) | |
| tree | 64ce113b557d3522302221659bcb6a0bb7ac8434 | |
| parent | cca8ab155e8c20b98ba2d90eb2b1c228895e06fd (diff) | |
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
| -rw-r--r-- | include/clang/Basic/FileManager.h | 1 | ||||
| -rw-r--r-- | lib/Basic/FileSystemStatCache.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/include/clang/Basic/FileManager.h b/include/clang/Basic/FileManager.h index cbe3cde65a..6718112d13 100644 --- 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 14f762e988..359e1924d0 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 |