emo/thin-provisioning-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[build] switch to c++11

Browse Source 
Conflicts:
	Makefile.in
	chunker/cache_stream.cc
	chunker/cache_stream.h
	thin-provisioning/thin_archive.cc
	thin-provisioning/thin_show_duplicates.cc
	unit-tests/Makefile.in
This commit is contained in:
Joe Thornber
2016-02-04 09:02:42 +00:00
parent 639af9c3bf
commit 767c39cf71
14 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
block-cache/block_cache.cc
View File

@@ -305,7 +305,7 @@ block_cache::find_unused_clean_block()
if (b.ref_count_)
continue;
block_set_.remove_node(b);
b.unlink_set();
b.unlink();
return &b;
}

11
block-cache/block_cache.h
View File

@@ -117,6 +117,10 @@ namespace bcache {
bc_->release(*this);
}
void unlink_set() {
set_hook_.unlink();
}
void unlink() {
list_hook_.unlink();
}
@@ -131,7 +135,7 @@ namespace bcache {
void *data_;
bi::list_member_hook<bi::link_mode<bi::auto_unlink>> list_hook_;
bi::set_member_hook<> set_hook_;
bi::set_member_hook<bi::link_mode<bi::auto_unlink>> set_hook_;
unsigned ref_count_;
@@ -142,8 +146,6 @@ namespace bcache {
validator::ptr v_;
};
<<<<<<< HEAD
=======
struct cmp_index {
bool operator()(block_address index, block const &b) const {
return index > b.index_;
@@ -192,7 +194,6 @@ namespace bcache {
block *b_;
};
>>>>>>> 7fadc34... [block-cache] convert to use boost::intrusive rather than kernel style lists.
//--------------------------------
block_cache(int fd, sector_t block_size,
@@ -282,7 +283,7 @@ namespace bcache {
block_list io_pending_;
typedef bi::member_hook<block,
bi::set_member_hook<>,
bi::set_member_hook<bi::link_mode<bi::auto_unlink>>,
&block::set_hook_> block_option;
typedef bi::set<block, block_option,
bi::constant_time_size<false>> block_set;