fixed various compile issues and namespace implementation

3 files changed, 8 insertions, 13 deletions

diff --git a/include/class.h b/include/class.h
index 1ac4f00..72615e5 100644
--- a/include/class.h
+++ b/include/class.h
@@ -116,9 +116,9 @@ private:
     }
     
     /**
-     *  Extensions have access to the private base class
+     *  Namespaces have access to the private base class
      */
-    friend class Extension;
+    friend class Namespace;
 };
 
 /**
diff --git a/include/extension.h b/include/extension.h
index 72c7d56..f04dc8c 100644
--- a/include/extension.h
+++ b/include/extension.h
@@ -152,14 +152,6 @@ public:
     
 private:
     /**
-     *  Initialize all functions in this namespace
-     *  @param  ns          Namespace prefix
-     *  @param  entries     The array to be filled
-     *  @return int         Number of functions that were initialized
-     */
-    size_t initialize(const std::string &ns, zend_function_entry entries[]);
-
-    /**
      *  The information that is passed to the Zend engine
      * 
      *  Although it would be slightly faster to not make this a pointer, this
diff --git a/include/namespace.h b/include/namespace.h
index 727f1dd..ef625fc 100644
--- a/include/namespace.h
+++ b/include/namespace.h
@@ -180,7 +180,7 @@ protected:
      *  @param  entries     The array to be filled
      *  @return int         Number of functions that were initialized
      */
-    size_t initialize(const std::string &ns, zend_function_entry entries[]);
+    size_t initialize(const std::string &ns, struct _zend_function_entry entries[]);
 
     /**
      *  Initialize the namespace after it was registered
@@ -188,11 +188,14 @@ protected:
      */
     void initialize(const std::string &parent)
     {
+        // the namespace to use
+        std::string prefix = parent.size() ? parent + "\\" + _name : _name;
+        
         // loop through the classes in this namespace
-        for (auto &c : _classes) c->initialize(parent+"\\"+_name);
+        for (auto &c : _classes) c->initialize(prefix);
         
         // and loop through the other namespaces
-        for (auto &n : _namespaces) n->initialize(parent+"\\"+_name);
+        for (auto &n : _namespaces) n->initialize(prefix);
     }
 };