diff options
| author | Travis CI <zmoelnig@travis-ci.umlaeute.mur.at> | 2017-04-26 14:33:14 +0000 |
|---|---|---|
| committer | Travis CI <zmoelnig@travis-ci.umlaeute.mur.at> | 2017-04-26 14:33:14 +0000 |
| commit | fe47d52243301fa02074ff824615406e72f3ca65 (patch) | |
| tree | 569c01e4e22ed0e8b59f1dd5ce2fe06aca833661 /Gem/develop | |
| parent | 027150827a4b2f641415225afb3b5a2ec8732617 (diff) | |
Gem 0b6be70ee74dfb8a0f8129672f400f3b2a4d8390 osx/x86_64
built 'master:0b6be70ee74dfb8a0f8129672f400f3b2a4d8390' for osx/x86_64
Diffstat (limited to 'Gem/develop')
| -rw-r--r-- | Gem/develop/include/Gem/Utils/any.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Gem/develop/include/Gem/Utils/any.h b/Gem/develop/include/Gem/Utils/any.h index 56cdec7..dff11bb 100644 --- a/Gem/develop/include/Gem/Utils/any.h +++ b/Gem/develop/include/Gem/Utils/any.h @@ -132,7 +132,7 @@ namespace gem template <typename T> any(const T& x) : table(NULL), object(NULL) { table = any_detail::get_table<T>::get(); -#ifdef __GNUC__ +#if defined(__GNUC__) && __GNUC__ >= 6 # pragma GCC diagnostic push # pragma GCC diagnostic ignored "-Wplacement-new" #endif @@ -142,7 +142,7 @@ namespace gem else { object = new T(x); } -#ifdef __GNUC__ +#if defined(__GNUC__) && __GNUC__ >= 6 # pragma GCC diagnostic pop #endif } @@ -188,7 +188,7 @@ namespace gem if (table == x_table) { // if so, we can avoid deallocating and resuse memory -#ifdef __GNUC__ +#if defined(__GNUC__) && __GNUC__ >= 6 # pragma GCC diagnostic push # pragma GCC diagnostic ignored "-Wplacement-new" #endif @@ -213,7 +213,7 @@ namespace gem object = new T(x); table = x_table; } -#ifdef __GNUC__ +#if defined(__GNUC__) && __GNUC__ >= 6 # pragma GCC diagnostic pop #endif } |