diff options
| author | Josh Durgin <jdurgin@redhat.com> | 2015-02-10 00:00:18 +0100 |
|---|---|---|
| committer | Josh Durgin <jdurgin@redhat.com> | 2015-02-10 00:48:15 +0100 |
| commit | 203c06da6dd4b5319a8c2938981c3de3660ede0f (patch) | |
| tree | a3ada0f1031d781da7f2966ab2e3716cc32e19a6 /src/test/multi_stress_watch.cc | |
| parent | Pipe: conditionally compile IPTOS setting (diff) | |
| download | ceph-203c06da6dd4b5319a8c2938981c3de3660ede0f.tar.xz ceph-203c06da6dd4b5319a8c2938981c3de3660ede0f.zip | |
locally disable pragma warnings on gcc < 4.6
diagnostic push|pop are not present before 4.6, so each use gives a
warning. Temporarily ignore these by disabling/reenabling -Wpragmas.
Note that this means the other disabled warnings are not scoped on
old gcc. I don't think this is worth fixing, since newer gcc will
respect the scope and show us the warnings outside of it.
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
Diffstat (limited to 'src/test/multi_stress_watch.cc')
| -rw-r--r-- | src/test/multi_stress_watch.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/test/multi_stress_watch.cc b/src/test/multi_stress_watch.cc index aa02d6941db..25f735558f5 100644 --- a/src/test/multi_stress_watch.cc +++ b/src/test/multi_stress_watch.cc @@ -29,6 +29,7 @@ public: } }; +#pragma GCC diagnostic ignored "-Wpragmas" #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" @@ -67,6 +68,7 @@ test_loop(Rados &cluster, std::string pool_name, std::string obj_name) } #pragma GCC diagnostic pop +#pragma GCC diagnostic warning "-Wpragmas" void test_replicated(Rados &cluster, std::string pool_name, std::string obj_name) |