diff options
| author | Marcin Junczys-Dowmunt <junczys@amu.edu.pl> | 2018-12-12 02:02:34 +0300 |
|---|---|---|
| committer | Marcin Junczys-Dowmunt <junczys@amu.edu.pl> | 2018-12-12 02:02:34 +0300 |
| commit | d602dda8e260878f7fe74567eb2189eb9c019acb (patch) | |
| tree | a67ade2046faec8b7b000daa713cd1d1d732f082 | |
| parent | fc490bba030240ab9495cb07e5cb837facd4d28f (diff) | |
| parent | dedceb82c6c4b1930920b31ddcdb6d3791e20def (diff) | |
Merge branch 'windows' of https://github.com/marian-nmt/marian-dev into windows
| -rwxr-xr-x | src/common/file_stream.h | 4 | ||||
| -rwxr-xr-x | src/common/filesystem.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/common/file_stream.h b/src/common/file_stream.h index 5e49e946..255948f0 100755 --- a/src/common/file_stream.h +++ b/src/common/file_stream.h @@ -4,14 +4,14 @@ #include "common/logging.h" #include "common/definitions.h" -#ifdef _GNUC_ +#ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wsuggest-override" #endif #include "3rd_party/zstr/zstr.hpp" #include <boost/iostreams/device/file_descriptor.hpp> #include <boost/iostreams/stream_buffer.hpp> -#ifdef _GNUC_ +#ifdef __GNUC__ #pragma GCC diagnostic pop #endif diff --git a/src/common/filesystem.h b/src/common/filesystem.h index e0062796..f9c06104 100755 --- a/src/common/filesystem.h +++ b/src/common/filesystem.h @@ -7,7 +7,7 @@ // @TODO: go back to canonical names for functions and objects // as specified in C++17 so it becomes easy to move in the future -#ifdef _GNUC_ +#ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wsuggest-override" #endif @@ -15,7 +15,7 @@ #include "3rd_party/pathie-cpp/include/path.hpp" #include "3rd_party/pathie-cpp/include/errors.hpp" -#ifdef _GNUC_ +#ifdef __GNUC__ #pragma GCC diagnostic pop #endif |