summaryrefslogtreecommitdiff
path: root/core/include
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-04-17 15:15:08 -0700
committerTom Sepez <tsepez@chromium.org>2015-04-17 15:15:08 -0700
commit4cb07c9c9cd5761ce3179d3d7254c1cf0efeafa5 (patch)
tree2549011fbc3d9d6b8415394a5dc6372a2b346b1e /core/include
parent48606843d54c5f870d69627afedd574b58d65b3e (diff)
downloadpdfium-4cb07c9c9cd5761ce3179d3d7254c1cf0efeafa5.tar.xz
Fix all remaining instances of FX_NEW.
R=thestig@chromium.org Review URL: https://codereview.chromium.org/1084613006
Diffstat (limited to 'core/include')
-rw-r--r--core/include/fpdfapi/fpdf_objects.h30
-rw-r--r--core/include/fxcrt/fx_memory.h2
2 files changed, 16 insertions, 16 deletions
diff --git a/core/include/fpdfapi/fpdf_objects.h b/core/include/fpdfapi/fpdf_objects.h
index df5803c76c..0315465367 100644
--- a/core/include/fpdfapi/fpdf_objects.h
+++ b/core/include/fpdfapi/fpdf_objects.h
@@ -113,7 +113,7 @@ public:
static CPDF_Boolean* Create(FX_BOOL value)
{
- return FX_NEW CPDF_Boolean(value);
+ return new CPDF_Boolean(value);
}
CPDF_Boolean() : CPDF_Object(PDFOBJ_BOOLEAN), m_bValue(false) { }
@@ -134,22 +134,22 @@ public:
static CPDF_Number* Create(int value)
{
- return FX_NEW CPDF_Number(value);
+ return new CPDF_Number(value);
}
static CPDF_Number* Create(FX_FLOAT value)
{
- return FX_NEW CPDF_Number(value);
+ return new CPDF_Number(value);
}
static CPDF_Number* Create(FX_BSTR str)
{
- return FX_NEW CPDF_Number(str);
+ return new CPDF_Number(str);
}
static CPDF_Number* Create(FX_BOOL bInteger, void* pData)
{
- return FX_NEW CPDF_Number(bInteger, pData);
+ return new CPDF_Number(bInteger, pData);
}
CPDF_Number() : CPDF_Object(PDFOBJ_NUMBER), m_bInteger(false), m_Integer(0) { }
@@ -212,12 +212,12 @@ public:
static CPDF_String* Create(const CFX_ByteString& str, FX_BOOL bHex = FALSE)
{
- return FX_NEW CPDF_String(str, bHex);
+ return new CPDF_String(str, bHex);
}
static CPDF_String* Create(const CFX_WideString& str)
{
- return FX_NEW CPDF_String(str);
+ return new CPDF_String(str);
}
CPDF_String() : CPDF_Object(PDFOBJ_STRING), m_bHex(FALSE) { }
@@ -255,17 +255,17 @@ public:
static CPDF_Name* Create(const CFX_ByteString& str)
{
- return FX_NEW CPDF_Name(str);
+ return new CPDF_Name(str);
}
static CPDF_Name* Create(FX_BSTR str)
{
- return FX_NEW CPDF_Name(str);
+ return new CPDF_Name(str);
}
static CPDF_Name* Create(FX_LPCSTR str)
{
- return FX_NEW CPDF_Name(str);
+ return new CPDF_Name(str);
}
CPDF_Name(const CFX_ByteString& str) : CPDF_Object(PDFOBJ_NAME), m_Name(str) { }
@@ -292,7 +292,7 @@ public:
static CPDF_Array* Create()
{
- return FX_NEW CPDF_Array();
+ return new CPDF_Array();
}
CPDF_Array() : CPDF_Object(PDFOBJ_ARRAY) { }
@@ -389,7 +389,7 @@ public:
static CPDF_Dictionary* Create()
{
- return FX_NEW CPDF_Dictionary();
+ return new CPDF_Dictionary();
}
CPDF_Dictionary() : CPDF_Object(PDFOBJ_DICTIONARY) { }
@@ -506,7 +506,7 @@ public:
static CPDF_Stream* Create(FX_LPBYTE pData, FX_DWORD size, CPDF_Dictionary* pDict)
{
- return FX_NEW CPDF_Stream(pData, size, pDict);
+ return new CPDF_Stream(pData, size, pDict);
}
CPDF_Stream(FX_LPBYTE pData, FX_DWORD size, CPDF_Dictionary* pDict);
@@ -664,7 +664,7 @@ public:
static CPDF_Null* Create()
{
- return FX_NEW CPDF_Null();
+ return new CPDF_Null();
}
CPDF_Null() : CPDF_Object(PDFOBJ_NULL) { }
@@ -675,7 +675,7 @@ public:
static CPDF_Reference* Create(CPDF_IndirectObjects* pDoc, int objnum)
{
- return FX_NEW CPDF_Reference(pDoc, objnum);
+ return new CPDF_Reference(pDoc, objnum);
}
CPDF_Reference(CPDF_IndirectObjects* pDoc, int objnum)
diff --git a/core/include/fxcrt/fx_memory.h b/core/include/fxcrt/fx_memory.h
index 4d56736011..4e7c501318 100644
--- a/core/include/fxcrt/fx_memory.h
+++ b/core/include/fxcrt/fx_memory.h
@@ -25,7 +25,7 @@ void FXMEM_DefaultFree(void* pointer, int flags);
}
#define FX_NEW new
-#define FX_NEW_VECTOR(Pointer, Class, Count) (Pointer = FX_NEW Class[Count])
+#define FX_NEW_VECTOR(Pointer, Class, Count) (Pointer = new Class[Count])
#define FX_DELETE_VECTOR(Pointer, Class, Count) delete[] Pointer
class CFX_DestructObject