RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-25 11:48:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

test/librbd/crypto: Fixup include order to prevent implicit definitions

Browse Source 
Clang complains a lot, part of it:
```
/home/jenkins/workspace/ceph-master-compile/src/test/librbd/crypto/test_mock_CryptoObjectDispatch.cc:35:8: error: explicit specialization of 'librbd::io::CopyupRequest<librbd::MockImageCtx>' after instantiation
struct CopyupRequest<librbd::MockImageCtx> {
       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/home/jenkins/workspace/ceph-master-compile/src/librbd/io/ObjectRequest.cc:560:10: note: implicit instantiation first required here
  if (it == image_ctx->copyup_list.end()) {
         ^
/home/jenkins/workspace/ceph-master-compile/src/test/librbd/crypto/test_mock_CryptoObjectDispatch.cc:54:32: error: template specialization requires 'template<>'
        librbd::MockImageCtx>::s_instance = nullptr;
```

fixes: https://github.com/ceph/ceph/pull/37916
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
This commit is contained in:
Willem Jan Withagen 2020-11-14 18:11:05 +01:00
parent 364e385a04
commit 8dc9344f97
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/test/librbd/crypto/test_mock_CryptoObjectDispatch.cc
View File

@ -15,9 +15,9 @@ template bool librbd::io::util::trigger_copyup(
MockImageCtx *image_ctx, uint64_t object_no, IOContext io_context,
Context* on_finish);
#include "librbd/io/ObjectRequest.cc"
template class librbd::io::ObjectWriteRequest<librbd::MockImageCtx>;
template class librbd::io::AbstractObjectWriteRequest<librbd::MockImageCtx>;
#include "librbd/io/ObjectRequest.cc"
namespace librbd {