From 2443500c8f002df2641e55c26a6a7882906a42da Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Sat, 10 Oct 2015 14:03:39 -0700 Subject: SubFolder should take a reference (not a pointer). --- ldid.cpp | 10 +++++----- ldid.hpp | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ldid.cpp b/ldid.cpp index c59ecdb..eb535fd 100644 --- a/ldid.cpp +++ b/ldid.cpp @@ -1643,22 +1643,22 @@ void DiskFolder::Find(const std::string &path, const Functor &code) { - return parent_->Save(path_ + path, code); + return parent_.Save(path_ + path, code); } bool SubFolder::Open(const std::string &path, const Functor &code) { - return parent_->Open(path_ + path, code); + return parent_.Open(path_ + path, code); } void SubFolder::Find(const std::string &path, const Functor &)> &)> &code) { - return parent_->Find(path_ + path, code); + return parent_.Find(path_ + path, code); } static size_t copy(std::streambuf &source, std::streambuf &target) { @@ -1837,7 +1837,7 @@ std::string Bundle(const std::string &root, Folder &folder, const std::string &k if (!nested(name)) return; auto bundle(root + Split(name).dir); - SubFolder subfolder(&folder, bundle); + SubFolder subfolder(folder, bundle); Bundle(bundle, subfolder, key, local); })); diff --git a/ldid.hpp b/ldid.hpp index b4d2ae5..4320bef 100644 --- a/ldid.hpp +++ b/ldid.hpp @@ -76,11 +76,11 @@ class SubFolder : public Folder { private: - Folder *parent_; + Folder &parent_; std::string path_; public: - SubFolder(Folder *parent, const std::string &path); + SubFolder(Folder &parent, const std::string &path); virtual void Save(const std::string &path, const Functor &code); virtual bool Open(const std::string &path, const Functor &code); -- cgit v1.2.3-56-ge451