diff options
| author | valmat <ufabiz@gmail.com> | 2014-04-10 13:09:43 +0600 |
|---|---|---|
| committer | valmat <ufabiz@gmail.com> | 2014-04-10 13:09:43 +0600 |
| commit | b015506a3b1738405a948d11e221e3948aa42d13 (patch) | |
| tree | 22ade795098cdf02db039d181a5bea38b551e057 /include/namespace.h | |
| parent | 14b63ee87dde3688fea7e58fa25b73362117ae11 (diff) | |
| parent | 6ac0bc83b53ab854baaaba74dd54e60c562751ff (diff) | |
Merge branch 'master' into ini
Conflicts:
include/namespace.h
Diffstat (limited to 'include/namespace.h')
| -rw-r--r-- | include/namespace.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/namespace.h b/include/namespace.h index 468a423..1c9d457 100644 --- a/include/namespace.h +++ b/include/namespace.h @@ -225,7 +225,7 @@ public: * * @param callback */ - void apply(const std::function<void(const std::string &ns, Function &func)> &callback); + void functions(const std::function<void(const std::string &ns, Function &func)> &callback); /** * Apply a callback to each registered class @@ -235,7 +235,7 @@ public: * * @param callback */ - void apply(const std::function<void(const std::string &ns, ClassBase &clss)> &callback); + void classes(const std::function<void(const std::string &ns, ClassBase &clss)> &callback); /** * Filling ini entries into external zend_ini_entry array @@ -243,8 +243,6 @@ public: */ void fill_ini(_zend_ini_entry *ini_entries, int module_number); - - }; /** |