From: Mukund Sivaraman Date: Sun, 7 Oct 2012 17:29:27 +0000 (+0530) Subject: [2268] Move constructor and destructor to top of file X-Git-Tag: trac2402_base~55 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ece07281abf99ae142b20b4aead428e3333121a9;p=thirdparty%2Fkea.git [2268] Move constructor and destructor to top of file --- diff --git a/src/lib/datasrc/memory/memory_client.cc b/src/lib/datasrc/memory/memory_client.cc index 8f444b610d..c29eca63ca 100644 --- a/src/lib/datasrc/memory/memory_client.cc +++ b/src/lib/datasrc/memory/memory_client.cc @@ -62,6 +62,22 @@ public: } }; +InMemoryClient::InMemoryClient(util::MemorySegment& mem_sgmt, + RRClass rrclass) : + mem_sgmt_(mem_sgmt), + rrclass_(rrclass), + zone_count_(0), + zone_table_(ZoneTable::create(mem_sgmt_, rrclass)), + file_name_tree_(FileNameTree::create(mem_sgmt_, false)) +{} + +InMemoryClient::~InMemoryClient() { + FileNameDeleter deleter; + FileNameTree::destroy(mem_sgmt_, file_name_tree_, deleter); + + ZoneTable::destroy(mem_sgmt_, zone_table_, rrclass_); +} + result::Result InMemoryClient::load(const Name& zone_name, const string& filename, @@ -161,22 +177,6 @@ generateRRsetFromIterator(ZoneIterator* iterator, } } -InMemoryClient::InMemoryClient(util::MemorySegment& mem_sgmt, - RRClass rrclass) : - mem_sgmt_(mem_sgmt), - rrclass_(rrclass), - zone_count_(0), - zone_table_(ZoneTable::create(mem_sgmt_, rrclass)), - file_name_tree_(FileNameTree::create(mem_sgmt_, false)) -{} - -InMemoryClient::~InMemoryClient() { - FileNameDeleter deleter; - FileNameTree::destroy(mem_sgmt_, file_name_tree_, deleter); - - ZoneTable::destroy(mem_sgmt_, zone_table_, rrclass_); -} - RRClass InMemoryClient::getClass() const { return (rrclass_);