From b8ade4b150c93251f9201759874b170c49f7fffa Mon Sep 17 00:00:00 2001 From: Dongryeol Lee Date: Thu, 25 Nov 2010 16:22:01 +0000 Subject: [PATCH] Minor cleanup before finishing up the distributed tree. --- .../core/tree/general_spacetree.h | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/fastlib/trunk/contrib/dongryel/thesis_research/core/tree/general_spacetree.h b/fastlib/trunk/contrib/dongryel/thesis_research/core/tree/general_spacetree.h index 723a331812..7ac3f5ac9c 100644 --- a/fastlib/trunk/contrib/dongryel/thesis_research/core/tree/general_spacetree.h +++ b/fastlib/trunk/contrib/dongryel/thesis_research/core/tree/general_spacetree.h @@ -38,6 +38,10 @@ namespace core { namespace tree { template < class TreeSpecType > class GeneralBinarySpaceTree { + private: + + friend class boost::serialization::access; + public: typedef typename TreeSpecType::BoundType BoundType; @@ -45,18 +49,12 @@ class GeneralBinarySpaceTree { typedef typename TreeSpecType::StatisticType StatisticType; + private: + /** @brief The bound for the node. */ BoundType bound_; - /** @brief The pointer to the left node. - */ - boost::interprocess::offset_ptr left_; - - /** @brief The pointer to the right node. - */ - boost::interprocess::offset_ptr right_; - /** @brief The beginning index. */ int begin_; @@ -69,7 +67,15 @@ class GeneralBinarySpaceTree { */ StatisticType stat_; - friend class boost::serialization::access; + /** @brief The pointer to the left node. + */ + boost::interprocess::offset_ptr left_; + + /** @brief The pointer to the right node. + */ + boost::interprocess::offset_ptr right_; + + public: template void save(Archive &ar, const unsigned int version) const { @@ -122,8 +128,6 @@ class GeneralBinarySpaceTree { count_ = -1; } - public: - void Init(int begin_in, int count_in) { begin_ = begin_in; count_ = count_in;