diff options
author | Brad Hubbard <bhubbard@redhat.com> | 2018-09-14 06:22:00 +0200 |
---|---|---|
committer | Brad Hubbard <bhubbard@redhat.com> | 2018-09-14 06:22:00 +0200 |
commit | 5009d9ecc692076360ff777e47db9902c7bff669 (patch) | |
tree | 34414ec9a5356c626a2f6b937a0c0e47e2fc594d /src/librados/RadosClient.cc | |
parent | Merge pull request #23896 from Songweibin/wip-group-snap-rollback (diff) | |
download | ceph-5009d9ecc692076360ff777e47db9902c7bff669.tar.xz ceph-5009d9ecc692076360ff777e47db9902c7bff669.zip |
Rename "include/assert.h"
This conflicts with the system assert.h so rename and change includes to
reflect the new name.
Fixes: http://tracker.ceph.com/issues/35682
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
Diffstat (limited to 'src/librados/RadosClient.cc')
-rw-r--r-- | src/librados/RadosClient.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librados/RadosClient.cc b/src/librados/RadosClient.cc index 51d3b9f2ceb..65966ade4a0 100644 --- a/src/librados/RadosClient.cc +++ b/src/librados/RadosClient.cc @@ -47,7 +47,7 @@ #include "PoolAsyncCompletionImpl.h" #include "RadosClient.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "common/EventTrace.h" #define dout_subsys ceph_subsys_rados |