[cfe-commits] r120079 - in /cfe/trunk: include/clang/Basic/FileManager.h lib/Basic/FileSystemStatCache.cpp

[Francois Pichet]

Author: fpichet
Date: Tue Nov 23 21:07:43 2010
New Revision: 120079

URL: http://llvm.org/viewvc/llvm-project?rev=120079&view=rev
Log:
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.

Modified:
    cfe/trunk/include/clang/Basic/FileManager.h
    cfe/trunk/lib/Basic/FileSystemStatCache.cpp

Modified: cfe/trunk/include/clang/Basic/FileManager.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/FileManager.h?rev=120079&r1=120078&r2=120079&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/FileManager.h (original)
+++ cfe/trunk/include/clang/Basic/FileManager.h Tue Nov 23 21:07:43 2010
@@ -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) {}

Modified: cfe/trunk/lib/Basic/FileSystemStatCache.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/FileSystemStatCache.cpp?rev=120079&r1=120078&r2=120079&view=diff
==============================================================================
--- cfe/trunk/lib/Basic/FileSystemStatCache.cpp (original)
+++ cfe/trunk/lib/Basic/FileSystemStatCache.cpp Tue Nov 23 21:07:43 2010
@@ -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