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/journal/Future.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/journal/Future.cc')
| -rw-r--r-- | src/journal/Future.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/journal/Future.cc b/src/journal/Future.cc index c2eaa967ac9..89f7fd326e9 100644 --- a/src/journal/Future.cc +++ b/src/journal/Future.cc @@ -3,7 +3,7 @@ #include "journal/Future.h" #include "journal/FutureImpl.h" -#include "include/assert.h" +#include "include/ceph_assert.h" namespace journal { |