1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00

Merge branch '2.0release' into develop

This commit is contained in:
winlin 2015-03-21 11:55:35 +08:00
commit e45c62003a
32 changed files with 282 additions and 258 deletions

View file

@ -41,9 +41,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
* SrsAutoFree(MyClass, po);
*/
#define SrsAutoFree(className, instance) \
__SrsAutoFree<className> _auto_free_##instance(&instance)
impl__SrsAutoFree<className> _auto_free_##instance(&instance)
template<class T>
class __SrsAutoFree
class impl__SrsAutoFree
{
private:
T** ptr;
@ -51,11 +51,11 @@ public:
/**
* auto delete the ptr.
*/
__SrsAutoFree(T** _ptr) {
impl__SrsAutoFree(T** _ptr) {
ptr = _ptr;
}
virtual ~__SrsAutoFree() {
virtual ~impl__SrsAutoFree() {
if (ptr == NULL || *ptr == NULL) {
return;
}