diff options
| author | valmat <ufabiz@gmail.com> | 2014-04-09 11:00:05 +0600 |
|---|---|---|
| committer | valmat <ufabiz@gmail.com> | 2014-04-09 11:00:05 +0600 |
| commit | 6c7c846edd5b74450b76532da33c25e6cc6a10a4 (patch) | |
| tree | 51b0e0be5c43ddba6ca9351026fc94bf8ae7bc07 /src/mixedobject.h | |
| parent | 08ed8866a5bba0b23a8d5587116a968512df2568 (diff) | |
| parent | 33760c3efba4207eac826ff080b5f9b9672fc60e (diff) | |
Merge branch 'master' into ini-master
Conflicts:
include/namespace.h
zend/extensionimpl.cpp
Diffstat (limited to 'src/mixedobject.h')
| -rw-r--r-- | src/mixedobject.h | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/src/mixedobject.h b/src/mixedobject.h deleted file mode 100644 index 4db74da..0000000 --- a/src/mixedobject.h +++ /dev/null @@ -1,39 +0,0 @@ -/** - * MixedObject.h - * - * Structure that combines a Zend object with an object in C++ - * - * @author Emiel Bruijntjes <emiel.bruijntjes@copernica.com> - * @copyright 2013 Copernica BV - */ - -/** - * Set up namespace - */ -namespace Php { - -/** - * Structure that combines a C++ object with a zend object - */ -struct MixedObject -{ - /** - * The actual object is the first member, so that casting - * the MixedObject to a zend_object will also result in a valid pointer - * @var zend_object - */ - zend_object php; - - /** - * Pointer to the C++ implementation - * @var Base - */ - Base *cpp; -}; - -/** - * End of namespace - */ -} - - |