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 | 31ee8bfb0e761d308a47bc435cd655328a74a822 (patch) | |
| tree | e1954bc9d90ef889921ce804a84ab3c813bd8e12 | |
| parent | 4e70ac7b684f8188ddafe83b8b5d02dc115d670d (diff) | |
| download | bcm5719-llvm-31ee8bfb0e761d308a47bc435cd655328a74a822.tar.gz bcm5719-llvm-31ee8bfb0e761d308a47bc435cd655328a74a822.zip | |
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.
llvm-svn: 120079
| -rw-r--r-- | clang/include/clang/Basic/FileManager.h | 1 | ||||
| -rw-r--r-- | clang/lib/Basic/FileSystemStatCache.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/clang/include/clang/Basic/FileManager.h b/clang/include/clang/Basic/FileManager.h index cbe3cde65aa..6718112d133 100644 --- a/clang/include/clang/Basic/FileManager.h +++ b/clang/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/clang/lib/Basic/FileSystemStatCache.cpp b/clang/lib/Basic/FileSystemStatCache.cpp index 14f762e9887..359e1924d00 100644 --- a/clang/lib/Basic/FileSystemStatCache.cpp +++ b/clang/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 |
