diff options
| author | Martijn Otto <martijn.otto@copernica.com> | 2014-02-17 10:04:40 +0100 |
|---|---|---|
| committer | Martijn Otto <martijn.otto@copernica.com> | 2014-02-17 10:04:40 +0100 |
| commit | 687d4f16ec8c45db4034a0eafc03663f67995f28 (patch) | |
| tree | 8f02e679215758da3216a7906a4d9fd0eac63235 /include | |
| parent | 06aa5fd5afaba69544b93654fb0a4f9c2651306e (diff) | |
Removed traits option: this would need to be conditionally included based on the PHP version, which we cannot do in headers (due to the fact we do not want to include the whole php library when compiling extensions)
Diffstat (limited to 'include')
| -rw-r--r-- | include/class.h | 6 | ||||
| -rw-r--r-- | include/zend.h | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/include/class.h b/include/class.h index 201f4de..243c2c8 100644 --- a/include/class.h +++ b/include/class.h @@ -129,15 +129,15 @@ public: ClassFlagged(const std::initializer_list<Member> &members) : Class<T>(members, FlagClass(Flags)) {} }; -template <typename T> // C++11 analog of `typedef`. Equivalent to the following pseudocode: typedef ClassFlagged<T, Zend::AccClass::FINAL> FinalClass<T>; +template <typename T> using FinalClass = ClassFlagged<T, Zend::AccClass::FINAL>; + template <typename T> using AbstractClass = ClassFlagged<T, Zend::AccClass::ABSTRACT>; + template <typename T> using Interface = ClassFlagged<T, Zend::AccClass::INTERFACE>; -template <typename T> -using Trait = ClassFlagged<T, Zend::AccClass::TRAIT>; /** * End of namespace diff --git a/include/zend.h b/include/zend.h index 66d82a2..9804606 100644 --- a/include/zend.h +++ b/include/zend.h @@ -68,7 +68,6 @@ namespace Php { ABSTRACT ,//= ZEND_ACC_EXPLICIT_ABSTRACT_CLASS, //0x20 FINAL ,//= ZEND_ACC_FINAL_CLASS, //0x40 INTERFACE ,//= ZEND_ACC_INTERFACE, //0x80 - TRAIT ,//= ZEND_ACC_TRAIT, //0x120 //class implement interface(s) flag, //IMPLEMENT_INTERFACES ,//= ZEND_ACC_IMPLEMENT_INTERFACES, //0x80000 @@ -82,4 +81,4 @@ namespace Php { */ } -#endif /* PHPCPP_ZEND_INCLUDE_C_H_ */
\ No newline at end of file +#endif /* PHPCPP_ZEND_INCLUDE_C_H_ */ |