King_DuckZ/dindexer
1
0
Fork 0
mirror of https://github.com/KingDuckZ/dindexer.git synced 2025-07-02 14:04:22 +00:00
Code Issues Releases Wiki Activity

Use Kakoune::SafePtr to hold the PathName in DirIterator.

Browse source
This commit is contained in:
King_DuckZ 2016-02-18 21:00:17 +01:00
parent 5a2fd1e25e
commit 8a97afd6bf
3 changed files with 55 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

10
include/dindexer-machinery/set_listing.hpp
View file

@ -19,6 +19,7 @@
#define id040FEEC20F7B4F65A3EF67BA6460E737
#include "dindexer-machinery/recorddata.hpp"
#include "kakoune/safe_ptr.hh"
#include <vector>
#include <boost/iterator/iterator_facade.hpp>
#include <memory>
@ -58,7 +59,7 @@ namespace mchlib {
DirIterator ( DirIterator<Const>&& parOther );
template <bool OtherConst>
DirIterator ( DirIterator<OtherConst>&& parOther, typename std::enable_if<std::is_convertible<typename DirIterator<OtherConst>::VecIterator, VecIterator>::value, enabler>::type = enabler() );
DirIterator ( VecIterator parBegin, VecIterator parEnd, std::unique_ptr<PathName>&& parBasePath, std::size_t parLevelOffset );
DirIterator ( VecIterator parBegin, VecIterator parEnd, const PathName* parBasePath, std::size_t parLevelOffset );
~DirIterator ( void ) noexcept;
private:
@ -72,7 +73,7 @@ namespace mchlib {
VecIterator m_current;
VecIterator m_end;
std::unique_ptr<PathName> m_base_path;
Kakoune::SafePtr<const PathName> m_base_path;
std::size_t m_level_offset;
};
};
@ -87,6 +88,9 @@ namespace mchlib {
explicit SetListingView ( const implem::DirIterator<Const>& parIter );
SetListingView ( list_iterator parBeg, list_iterator parEnd, std::size_t parLevelOffset );
SetListingView ( list_iterator parBeg, list_iterator parEnd, std::size_t parLevelOffset, const std::shared_ptr<PathName>& parBasePath );
template <bool B=not Const, typename Other=typename std::enable_if<B, SetListingView<not B>>::type>
SetListingView ( const Other& parOther );
SetListingView ( SetListingView&& ) = default;
~SetListingView ( void ) noexcept = default;
@ -102,6 +106,7 @@ namespace mchlib {
private:
list_iterator m_begin;
list_iterator m_end;
std::shared_ptr<PathName> m_base_path;
std::size_t m_level_offset;
};
@ -128,6 +133,7 @@ namespace mchlib {
private:
ListType m_list;
std::shared_ptr<PathName> m_base_path;
};
template <bool Const>