diff options
| author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:21:59 +0200 |
|---|---|---|
| committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:21:59 +0200 |
| commit | d4af25c52a28b93484ffb55e0a8027bc4ce7856f (patch) | |
| tree | 853d57468d6b370711e7a5dd2c3dc7d5bac81b10 /zen/thread.h | |
| parent | 5.8 (diff) | |
| download | FreeFileSync-d4af25c52a28b93484ffb55e0a8027bc4ce7856f.tar.gz FreeFileSync-d4af25c52a28b93484ffb55e0a8027bc4ce7856f.tar.bz2 FreeFileSync-d4af25c52a28b93484ffb55e0a8027bc4ce7856f.zip | |
5.9
Diffstat (limited to 'zen/thread.h')
| -rw-r--r-- | zen/thread.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/zen/thread.h b/zen/thread.h index 440940ce..432a521e 100644 --- a/zen/thread.h +++ b/zen/thread.h @@ -20,6 +20,7 @@ #endif #ifdef _MSC_VER #pragma warning(disable : 4702) //unreachable code +#pragma warning(disable : 4913) //user defined binary operator ',' exists but no overload could convert all operands, default built-in binary operator ',' used #endif #include <boost/thread.hpp> @@ -28,7 +29,8 @@ #pragma GCC diagnostic pop #endif #ifdef _MSC_VER -#pragma warning(default : 4702) //unreachable code +#pragma warning(default : 4702) +#pragma warning(default : 4913) #endif namespace zen |