Index: src/ports/SkOSFile_win.cpp |
diff --git a/src/ports/SkOSFile_win.cpp b/src/ports/SkOSFile_win.cpp |
index 7fec557987e307d6faae0789aea88a04f51fc294..fd1c367318cb75dca70f6404dffabadb532c7f3f 100644 |
--- a/src/ports/SkOSFile_win.cpp |
+++ b/src/ports/SkOSFile_win.cpp |
@@ -50,18 +50,18 @@ bool sk_fidentical(SkFILE* a, SkFILE* b) { |
&& aID.fVolume == bID.fVolume; |
} |
-template <typename HandleType, HandleType InvalidValue, BOOL (WINAPI * Close)(HandleType)> |
+template <typename HandleType, LONG_PTR InvalidValue, BOOL (WINAPI * Close)(HandleType)> |
bungeman-skia
2014/03/14 14:50:37
Ick, ack, uck. So technically... in the C++ specif
|
class SkAutoTHandle : SkNoncopyable { |
public: |
SkAutoTHandle(HandleType handle) : fHandle(handle) { } |
~SkAutoTHandle() { Close(fHandle); } |
operator HandleType() { return fHandle; } |
- bool isValid() { return InvalidValue != fHandle; } |
+ bool isValid() { return HandleType(InvalidValue) != fHandle; } |
private: |
HandleType fHandle; |
}; |
-typedef SkAutoTHandle<HANDLE, INVALID_HANDLE_VALUE, CloseHandle> SkAutoWinFile; |
-typedef SkAutoTHandle<HANDLE, NULL, CloseHandle> SkAutoWinMMap; |
+typedef SkAutoTHandle<HANDLE, -1 /* INVALID_HANDLE_VALUE */, CloseHandle> SkAutoWinFile; |
+typedef SkAutoTHandle<HANDLE, 0 /* NULL */, CloseHandle> SkAutoWinMMap; |
void sk_fmunmap(const void* addr, size_t) { |
UnmapViewOfFile(addr); |