Fix these errors:
caching/superblock.cc:306: error: reference to 'validator' is ambiguous caching/superblock.cc:271: error: candidates are: namespace validator { } ./block-cache/block_cache.h:22: error: class bcache::validator caching/superblock.cc:316: error: reference to 'validator' is ambiguous caching/superblock.cc:271: error: candidates are: namespace validator { } ./block-cache/block_cache.h:22: error: class bcache::validator Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
This commit is contained in:
parent
dd9bd206c6
commit
150a3c486d
@ -302,8 +302,9 @@ namespace validator {
|
|||||||
superblock
|
superblock
|
||||||
caching::read_superblock(block_manager<>::ptr bm, block_address location)
|
caching::read_superblock(block_manager<>::ptr bm, block_address location)
|
||||||
{
|
{
|
||||||
|
using namespace validator;
|
||||||
superblock sb;
|
superblock sb;
|
||||||
block_manager<>::read_ref r = bm->read_lock(location, validator::mk_v());
|
block_manager<>::read_ref r = bm->read_lock(location, mk_v());
|
||||||
superblock_disk const *sbd = reinterpret_cast<superblock_disk const *>(r.data());
|
superblock_disk const *sbd = reinterpret_cast<superblock_disk const *>(r.data());
|
||||||
superblock_traits::unpack(*sbd, sb);
|
superblock_traits::unpack(*sbd, sb);
|
||||||
|
|
||||||
@ -313,7 +314,8 @@ caching::read_superblock(block_manager<>::ptr bm, block_address location)
|
|||||||
void
|
void
|
||||||
caching::write_superblock(block_manager<>::ptr bm, superblock const &sb, block_address location)
|
caching::write_superblock(block_manager<>::ptr bm, superblock const &sb, block_address location)
|
||||||
{
|
{
|
||||||
block_manager<>::write_ref w = bm->superblock_zero(location, validator::mk_v());
|
using namespace validator;
|
||||||
|
block_manager<>::write_ref w = bm->superblock_zero(location, mk_v());
|
||||||
superblock_traits::pack(sb, *reinterpret_cast<superblock_disk *>(w.data()));
|
superblock_traits::pack(sb, *reinterpret_cast<superblock_disk *>(w.data()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user