diff options
| author | Daniel Wilhelm <daniel@wili.li> | 2015-10-02 14:53:55 +0200 |
|---|---|---|
| committer | Daniel Wilhelm <daniel@wili.li> | 2015-10-02 14:53:55 +0200 |
| commit | 9321c6bdfc559db6cf436d4ea88198983ce59846 (patch) | |
| tree | e711c3373711b70b26de188aa4a893ffd30a1754 /zen/thread.h | |
| parent | 6.11 (diff) | |
| download | FreeFileSync-9321c6bdfc559db6cf436d4ea88198983ce59846.tar.gz FreeFileSync-9321c6bdfc559db6cf436d4ea88198983ce59846.tar.bz2 FreeFileSync-9321c6bdfc559db6cf436d4ea88198983ce59846.zip | |
6.12
Diffstat (limited to 'zen/thread.h')
| -rw-r--r-- | zen/thread.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/zen/thread.h b/zen/thread.h index a834f070..cca2561f 100644 --- a/zen/thread.h +++ b/zen/thread.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -12,27 +12,27 @@ //workaround this pathetic boost thread warning mess #ifdef __GNUC__ -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wswitch-enum" -#pragma GCC diagnostic ignored "-Wstrict-aliasing" -#pragma GCC diagnostic ignored "-Wredundant-decls" -#pragma GCC diagnostic ignored "-Wshadow" -#ifndef __clang__ //clang defines __GNUC__, but doesn't support this warning -#pragma GCC diagnostic ignored "-Wunused-local-typedefs" -#endif + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wswitch-enum" + #pragma GCC diagnostic ignored "-Wstrict-aliasing" + #pragma GCC diagnostic ignored "-Wredundant-decls" + #pragma GCC diagnostic ignored "-Wshadow" + #ifndef __clang__ //clang defines __GNUC__, but doesn't support this warning + #pragma GCC diagnostic ignored "-Wunused-local-typedefs" + #endif #endif #ifdef _MSC_VER -#pragma warning(push) -#pragma warning(disable : 4702 4913) //unreachable code; user defined binary operator ',' exists but no overload could convert all operands, default built-in binary operator ',' used + #pragma warning(push) + #pragma warning(disable : 4702 4913) //unreachable code; user defined binary operator ',' exists but no overload could convert all operands, default built-in binary operator ',' used #endif #include <boost/thread.hpp> #ifdef __GNUC__ -#pragma GCC diagnostic pop + #pragma GCC diagnostic pop #endif #ifdef _MSC_VER -#pragma warning(pop) + #pragma warning(pop) #endif namespace zen @@ -85,7 +85,7 @@ private: //###################### implementation ###################### #ifndef BOOST_HAS_THREADS -#error just some paranoia check... + #error just some paranoia check... #endif template <class Function> inline |