diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-06-16 16:00:24 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-06-16 16:00:24 -0700 |
| commit | 6c949d13ad2543e28cf174ecf457b5adcdf213bf (patch) | |
| tree | e3d442fe5a39352c5edf9cb4fb677f6a23d0db4b /xfa/src/fgas/include | |
| parent | 3403db90496fc87269d7bb1d033347ee19fc0c38 (diff) | |
| download | pdfium-6c949d13ad2543e28cf174ecf457b5adcdf213bf.tar.xz | |
XFA: Write new as "new" rather than using several macros.
Really?
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1183193004.
Diffstat (limited to 'xfa/src/fgas/include')
| -rw-r--r-- | xfa/src/fgas/include/fx_mem.h | 2 | ||||
| -rw-r--r-- | xfa/src/fgas/include/fx_utl.h | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/xfa/src/fgas/include/fx_mem.h b/xfa/src/fgas/include/fx_mem.h index 265c582884..c8875e185d 100644 --- a/xfa/src/fgas/include/fx_mem.h +++ b/xfa/src/fgas/include/fx_mem.h @@ -51,8 +51,6 @@ public: }
void operator delete(void *p, void *place) {}
};
-#define FXTARGET_New new
#define FXTARGET_NewWith(__allocator__) new(__allocator__)
-#define FXTARGET_Delete delete
#define FXTARGET_DeleteWith(__class__, __allocator__, pointer) {(pointer)->~__class__(); (pointer)->operator delete((pointer), (__allocator__));}
#endif
diff --git a/xfa/src/fgas/include/fx_utl.h b/xfa/src/fgas/include/fx_utl.h index 38342a8cc8..2e4ad41842 100644 --- a/xfa/src/fgas/include/fx_utl.h +++ b/xfa/src/fgas/include/fx_utl.h @@ -132,7 +132,7 @@ public: {
int32_t index = CFX_BaseArray::GetSize();
baseType *p = (baseType*)CFX_BaseArray::AddSpaceTo(index);
- FXTARGET_New ((void*)p)baseType(element);
+ new ((void*)p) baseType(element);
return index;
}
baseType& GetAt(int32_t index) const
@@ -194,7 +194,7 @@ public: int32_t iBlockSize = CFX_BaseArray::GetBlockSize();
iSize = iStart + iCount;
for (int32_t i = iStart; i < iSize; i ++) {
- FXTARGET_New ((void*)pStart)baseType(src.GetAt(i));
+ new ((void*)pStart)baseType(src.GetAt(i));
pStart += iBlockSize;
}
return iCount;
@@ -312,7 +312,7 @@ public: {
int32_t index = CFX_BaseMassArray::GetSize();
baseType *p = (baseType*)CFX_BaseMassArray::AddSpaceTo(index);
- FXTARGET_New ((void*)p)baseType(element);
+ new ((void*)p)baseType(element);
return index;
}
baseType& GetAt(int32_t index) const
@@ -483,7 +483,7 @@ public: {
int32_t index = CFX_BaseStack::GetSize();
baseType *p = (baseType*)CFX_BaseStack::Push();
- FXTARGET_New ((void*)p)baseType(element);
+ new ((void*)p)baseType(element);
return index;
}
void Pop()
@@ -780,7 +780,7 @@ public: if (pParent == NULL) {
pParent = &m_Root;
}
- CPLTreeNode *pChild = FXTARGET_New CPLTreeNode;
+ CPLTreeNode *pChild = new CPLTreeNode;
pChild->SetParentNode(pParent);
pChild->SetData(data);
if (pParent->m_pChildNode == NULL) {
|