propagate from branch 'net.randombit.botan' (head 294e2082ce9231d6165276e2f2a4153a0116aca3)

            to branch 'net.randombit.botan.c++0x' (head 0b695fad10f924601e07b009fcd781191fafcb28)

2 files changed, 16 insertions, 10 deletions

diff --git a/src/entropy/proc_walk/es_ftw.cpp b/src/entropy/proc_walk/es_ftw.cpp
index 5e2b17860..53e39d834 100644
--- a/src/entropy/proc_walk/es_ftw.cpp
+++ b/src/entropy/proc_walk/es_ftw.cpp
@@ -22,9 +22,23 @@
 
 namespace Botan {
 
+/**
+* Returns file descriptors. Until it doesn't
+*/
+class File_Descriptor_Source
+   {
+   public:
+      /**
+      * @return next file descriptor, or -1 if done
+      */
+      virtual int next_fd() = 0;
+
+      virtual ~File_Descriptor_Source() {}
+   };
+
 namespace {
 
-class Directory_Walker : public FTW_EntropySource::File_Descriptor_Source
+class Directory_Walker : public File_Descriptor_Source
    {
    public:
       Directory_Walker(const std::string& root) { add_directory(root); }
diff --git a/src/entropy/proc_walk/es_ftw.h b/src/entropy/proc_walk/es_ftw.h
index d7a719818..3ba222d46 100644
--- a/src/entropy/proc_walk/es_ftw.h
+++ b/src/entropy/proc_walk/es_ftw.h
@@ -24,17 +24,9 @@ class FTW_EntropySource : public EntropySource
 
       FTW_EntropySource(const std::string& root_dir);
       ~FTW_EntropySource();
-
-      class File_Descriptor_Source
-         {
-         public:
-            virtual int next_fd() = 0;
-            virtual ~File_Descriptor_Source() {}
-         };
    private:
-
       std::string path;
-      File_Descriptor_Source* dir;
+      class File_Descriptor_Source* dir;
    };
 
 }