diff options
| author | shuffle2 <godisgovernment@gmail.com> | 2017-06-07 21:20:06 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-07 21:20:06 -0700 |
| commit | ffd8309aca806a6cf5ca4da85f5854ef14c8e0d9 (patch) | |
| tree | ba029b5a68e1613f3dca3185a854ef70d05de61e /Source/Core/Common/SDCardUtil.cpp | |
| parent | a2358786dc66eab8fa63987751d4e3fc1a3ee525 (diff) | |
| parent | 9ee63608b3c7160cadb0291e577b158d1b8aa5c6 (diff) | |
Merge branch 'master' into fix-unittests
Diffstat (limited to 'Source/Core/Common/SDCardUtil.cpp')
| -rw-r--r-- | Source/Core/Common/SDCardUtil.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Source/Core/Common/SDCardUtil.cpp b/Source/Core/Common/SDCardUtil.cpp index 1bb09878b6..9e72990747 100644 --- a/Source/Core/Common/SDCardUtil.cpp +++ b/Source/Core/Common/SDCardUtil.cpp @@ -49,6 +49,11 @@ #include <unistd.h> // for unlink() #endif +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable : 4310) +#endif + /* Believe me, you *don't* want to change these constants !! */ #define BYTES_PER_SECTOR 512 #define RESERVED_SECTORS 32 @@ -289,3 +294,7 @@ FailWrite: ERROR_LOG(COMMON, "unlink(%s) failed: %s", filename.c_str(), GetLastErrorMsg().c_str()); return false; } + +#ifdef _MSC_VER +#pragma warning(pop) +#endif |