| Index: core/include/fxcrt/fx_basic.h
|
| diff --git a/core/include/fxcrt/fx_basic.h b/core/include/fxcrt/fx_basic.h
|
| index 7b700d36a8b77ecbcaf3fefe188e9b8aecebc159..275653ef9ecfbc8bc69c4cab26327ab057e061a9 100644
|
| --- a/core/include/fxcrt/fx_basic.h
|
| +++ b/core/include/fxcrt/fx_basic.h
|
| @@ -1271,12 +1271,8 @@ public:
|
| if (m_pObject->m_RefCount <= 0) {
|
| delete m_pObject;
|
| }
|
| - m_pObject = NULL;
|
| - }
|
| - m_pObject = FX_NEW CountedObj;
|
| - if (!m_pObject) {
|
| - return NULL;
|
| }
|
| + m_pObject = new CountedObj;
|
| m_pObject->m_RefCount = 1;
|
| return m_pObject;
|
| }
|
| @@ -1331,18 +1327,13 @@ public:
|
| ObjClass* GetModify()
|
| {
|
| if (m_pObject == NULL) {
|
| - m_pObject = FX_NEW CountedObj;
|
| - if (m_pObject) {
|
| - m_pObject->m_RefCount = 1;
|
| - }
|
| + m_pObject = new CountedObj;
|
| + m_pObject->m_RefCount = 1;
|
| } else if (m_pObject->m_RefCount > 1) {
|
| m_pObject->m_RefCount --;
|
| CountedObj* pOldObject = m_pObject;
|
| - m_pObject = NULL;
|
| - m_pObject = FX_NEW CountedObj(*pOldObject);
|
| - if (m_pObject) {
|
| - m_pObject->m_RefCount = 1;
|
| - }
|
| + m_pObject = new CountedObj(*pOldObject);
|
| + m_pObject->m_RefCount = 1;
|
| }
|
| return m_pObject;
|
| }
|
|
|