SubFolder should take a reference (not a pointer).

diff --git a/ldid.cpp b/ldid.cpp
index c59ecdbf49bca13478b49a0ad7f061507e46f87a..eb535fd82f808ce2a979469e15bf83a36f97673a 100644 (file)
--- a/ldid.cpp
+++ b/ldid.cpp
@@ -1643,22 +1643,22 @@ void DiskFolder::Find(const std::string &path, const Functor<void (const std::st
     Find(path, "", code);
 }
 
     Find(path, "", code);
 }
 

-SubFolder::SubFolder(Folder *parent, const std::string &path) :
+SubFolder::SubFolder(Folder &parent, const std::string &path) :

     parent_(parent),
     path_(path)
 {
 }
 
 void SubFolder::Save(const std::string &path, const Functor<void (std::streambuf &)> &code) {
     parent_(parent),
     path_(path)
 {
 }
 
 void SubFolder::Save(const std::string &path, const Functor<void (std::streambuf &)> &code) {

-    return parent_->Save(path_ + path, code);
+    return parent_.Save(path_ + path, code);

 }
 
 bool SubFolder::Open(const std::string &path, const Functor<void (std::streambuf &)> &code) {
 }
 
 bool SubFolder::Open(const std::string &path, const Functor<void (std::streambuf &)> &code) {

-    return parent_->Open(path_ + path, code);
+    return parent_.Open(path_ + path, code);

 }
 
 void SubFolder::Find(const std::string &path, const Functor<void (const std::string &, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &)> &code) {
 }
 
 void SubFolder::Find(const std::string &path, const Functor<void (const std::string &, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &)> &code) {

-    return parent_->Find(path_ + path, code);
+    return parent_.Find(path_ + path, code);

 }
 
 static size_t copy(std::streambuf &source, std::streambuf &target) {
 }
 
 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);
         if (!nested(name))
             return;
         auto bundle(root + Split(name).dir);

-        SubFolder subfolder(&folder, bundle);
+        SubFolder subfolder(folder, bundle);

         Bundle(bundle, subfolder, key, local);
     }));
 
         Bundle(bundle, subfolder, key, local);
     }));
 

diff --git a/ldid.hpp b/ldid.hpp
index b4d2ae5757639079b092cdc8afe08a0e483b88c2..4320befef7c3ffde2a2a637997c5e9ff0da733f2 100644 (file)
--- a/ldid.hpp
+++ b/ldid.hpp
@@ -76,11 +76,11 @@ class SubFolder :
     public Folder
 {
   private:
     public Folder
 {
   private:

-    Folder *parent_;
+    Folder &parent_;

     std::string path_;
 
   public:
     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<void (std::streambuf &)> &code);
     virtual bool Open(const std::string &path, const Functor<void (std::streambuf &)> &code);
 
     virtual void Save(const std::string &path, const Functor<void (std::streambuf &)> &code);
     virtual bool Open(const std::string &path, const Functor<void (std::streambuf &)> &code);