From 7bacd3779e62184a287400d6f8b2f0a30640f8c5 Mon Sep 17 00:00:00 2001 From: "Vladimir Gladkov (office-win10)" Date: Thu, 29 Jun 2023 14:43:01 +0800 Subject: [PATCH] [all] replace legacy AXL_MEM_... macros with new/delete/allocate/deallocate --- src/CmdLine.cpp | 2 +- src/DoxyXmlParser.cpp | 4 ++-- src/DoxyXmlParser.h | 4 ++-- src/DoxyXmlType.cpp | 36 ++++++++++++++++++------------------ src/Module.cpp | 12 ++++++------ 5 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/CmdLine.cpp b/src/CmdLine.cpp index 59cbc09c2..f549479f1 100644 --- a/src/CmdLine.cpp +++ b/src/CmdLine.cpp @@ -45,7 +45,7 @@ CmdLineParser::onSwitch( break; case CmdLineSwitchKind_Define: - Define* define = AXL_MEM_NEW(Define); + Define* define = new Define; size_t i = value.find('='); if (i == -1) { diff --git a/src/DoxyXmlParser.cpp b/src/DoxyXmlParser.cpp index d4dfa7ad4..dbdd4b894 100644 --- a/src/DoxyXmlParser.cpp +++ b/src/DoxyXmlParser.cpp @@ -44,7 +44,7 @@ DoxyXmlParser::clear() { size_t count = m_typeStack.getCount(); for (size_t i = 0; i < count; i++) { DoxyXmlType* type = m_typeStack[i].m_type; - AXL_MEM_DELETE(type); + delete type; } m_typeStack.clear(); @@ -56,7 +56,7 @@ DoxyXmlParser::popType() { DoxyXmlType* type = m_typeStack.getBack().m_type; type->onPopType(); - AXL_MEM_DELETE(type); + delete type; m_typeStack.pop(); } diff --git a/src/DoxyXmlParser.h b/src/DoxyXmlParser.h index 6d32440fb..d63b904a1 100644 --- a/src/DoxyXmlParser.h +++ b/src/DoxyXmlParser.h @@ -110,7 +110,7 @@ class DoxyXmlParser: public xml::ExpatParser { const char* name, const char** attributes ) { - T* type = AXL_MEM_NEW(T); + T* type = new T; TypeStackEntry entry = { type, 0 }; m_typeStack.append(entry); return type->create(this, name, attributes); @@ -126,7 +126,7 @@ class DoxyXmlParser: public xml::ExpatParser { const char* name, const char** attributes ) { - T* type = AXL_MEM_NEW(T); + T* type = new T; TypeStackEntry entry = { type, 0 }; m_typeStack.append(entry); return type->create(this, context, name, attributes); diff --git a/src/DoxyXmlType.cpp b/src/DoxyXmlType.cpp index e2ff611fa..36cda7f96 100644 --- a/src/DoxyXmlType.cpp +++ b/src/DoxyXmlType.cpp @@ -152,7 +152,7 @@ CompoundDefType::create( Module* module = parser->getModule(); m_parser = parser; - m_compound = AXL_MEM_NEW(Compound); + m_compound = new Compound; module->m_compoundList.insertTail(m_compound); parser->pushCompound(m_compound); @@ -336,7 +336,7 @@ RefType::create( const char** attributes ) { m_parser = parser; - m_ref = AXL_MEM_NEW(Ref); + m_ref = new Ref; list->insertTail(m_ref); while (*attributes) { @@ -426,7 +426,7 @@ MemberDefType::create( Module* module = parser->getModule(); m_parser = parser; - m_member = AXL_MEM_NEW(Member); + m_member = new Member; m_member->m_parentCompound = parent; parent->m_memberList.insertTail(m_member); @@ -810,7 +810,7 @@ DocSectionBlockType::create( const char** attributes ) { m_parser = parser; - m_sectionBlock = AXL_MEM_NEW(DocSectionBlock); + m_sectionBlock = new DocSectionBlock; m_sectionBlock->m_blockKind = name; list->insertTail(m_sectionBlock); @@ -867,7 +867,7 @@ EnumValueType::create( Module* module = parser->getModule(); m_parser = parser; - m_enumValue = AXL_MEM_NEW(EnumValue); + m_enumValue = new EnumValue; m_enumValue->m_parentEnum = member; member->m_enumValueList.insertTail(m_enumValue); @@ -982,7 +982,7 @@ ParamType::create( const char** attributes ) { m_parser = parser; - m_param = AXL_MEM_NEW(Param); + m_param = new Param; list->insertTail(m_param); return true; @@ -1038,7 +1038,7 @@ LinkedTextType::create( ) { m_parser = parser; m_linkedText = linkedText; - m_refText = AXL_MEM_NEW(RefText); + m_refText = new RefText; m_linkedText->m_refTextList.insertTail(m_refText); return true; @@ -1056,7 +1056,7 @@ LinkedTextType::onStartElement( break; } - m_refText = AXL_MEM_NEW(RefText); + m_refText = new RefText; m_linkedText->m_refTextList.insertTail(m_refText); return true; } @@ -1071,7 +1071,7 @@ RefTextType::create( const char** attributes ) { m_parser = parser; - m_refText = AXL_MEM_NEW(RefText); + m_refText = new RefText; linkedText->m_refTextList.insertTail(m_refText); while (*attributes) { @@ -1110,11 +1110,11 @@ DocParaType::create( const char** attributes ) { m_parser = parser; - m_paragraphBlock = AXL_MEM_NEW(DocBlock); + m_paragraphBlock = new DocBlock; m_paragraphBlock->m_blockKind = name; blockList->insertTail(m_paragraphBlock); - m_textBlock = AXL_MEM_NEW(DocBlock); + m_textBlock = new DocBlock; m_paragraphBlock->m_childBlockList.insertTail(m_textBlock); return true; @@ -1155,7 +1155,7 @@ DocParaType::onStartElement( m_parser->pushType(&m_paragraphBlock->m_childBlockList, name, attributes); } - m_textBlock = AXL_MEM_NEW(DocBlock); + m_textBlock = new DocBlock; m_paragraphBlock->m_childBlockList.insertTail(m_textBlock); return true; } @@ -1170,7 +1170,7 @@ DocRefTextType::create( const char** attributes ) { m_parser = parser; - m_refBlock = AXL_MEM_NEW(DocRefBlock); + m_refBlock = new DocRefBlock; m_refBlock->m_module = m_parser->getModule(); m_refBlock->m_blockKind = name; list->insertTail(m_refBlock); @@ -1207,7 +1207,7 @@ DocAnchorType::create( const char** attributes ) { m_parser = parser; - m_anchorBlock = AXL_MEM_NEW(DocAnchorBlock); + m_anchorBlock = new DocAnchorBlock; m_anchorBlock->m_blockKind = name; list->insertTail(m_anchorBlock); @@ -1240,7 +1240,7 @@ DocImageType::create( const char** attributes ) { m_parser = parser; - m_imageBlock = AXL_MEM_NEW(DocImageBlock); + m_imageBlock = new DocImageBlock; m_imageBlock->m_blockKind = name; list->insertTail(m_imageBlock); @@ -1280,7 +1280,7 @@ DocUlinkType::create( const char** attributes ) { m_parser = parser; - m_ulinkBlock = AXL_MEM_NEW(DocUlinkBlock); + m_ulinkBlock = new DocUlinkBlock; m_ulinkBlock->m_blockKind = name; list->insertTail(m_ulinkBlock); @@ -1310,7 +1310,7 @@ DocHeadingType::create( const char** attributes ) { m_parser = parser; - m_headingBlock = AXL_MEM_NEW(DocHeadingBlock); + m_headingBlock = new DocHeadingBlock; m_headingBlock->m_blockKind = name; list->insertTail(m_headingBlock); @@ -1339,7 +1339,7 @@ DocSimpleSectionType::create( const char** attributes ) { m_parser = parser; - m_sectionBlock = AXL_MEM_NEW(DocSimpleSectionBlock); + m_sectionBlock = new DocSimpleSectionBlock; m_sectionBlock->m_blockKind = name; list->insertTail(m_sectionBlock); diff --git a/src/Module.cpp b/src/Module.cpp index 6a5fef654..8a7c0e01f 100644 --- a/src/Module.cpp +++ b/src/Module.cpp @@ -746,7 +746,7 @@ Compound::unspecializeName() { Param* Compound::createTemplateSpecParam(const sl::StringRef& name) { - Param* param = AXL_MEM_NEW(Param); + Param* param = new Param; param->m_declarationName = name; param->m_declarationName.trim(); @@ -1088,7 +1088,7 @@ GlobalNamespace::build( for (size_t i = 0; i < count; i++) { Compound* compound = module->m_namespaceArray[i]; - Namespace* nspace = AXL_MEM_NEW(Namespace); + Namespace* nspace = new Namespace; m_namespaceList.insertTail(nspace); nspace->m_compound = compound; compound->m_selfNamespace = nspace; @@ -1165,7 +1165,7 @@ GlobalNamespace::build( Compound* baseCompound; if (refIt->m_id.isEmpty() || !refIt->m_importId.isEmpty()) { // template or imported base - baseCompound = AXL_MEM_NEW(Compound); + baseCompound = new Compound; baseCompound->m_id = refIt->m_id; baseCompound->m_importId = refIt->m_importId; baseCompound->m_name = refIt->m_text; @@ -1325,7 +1325,7 @@ GlobalNamespace::getGroupNamespace( if (groupCompound->m_selfNamespace) return groupCompound->m_selfNamespace; - Namespace* nspace = AXL_MEM_NEW(Namespace); + Namespace* nspace = new Namespace; m_namespaceList.insertTail(nspace); nspace->m_compound = groupCompound; nspace->m_footnoteArray = groupCompound->m_groupFootnoteArray; @@ -1347,14 +1347,14 @@ GlobalNamespace::createMemberCompound( Module* module, Member* member ) { - Compound* compound = AXL_MEM_NEW(Compound); + Compound* compound = new Compound; compound->m_compoundKind = member->m_memberKind == MemberKind_Service ? CompoundKind_Service : CompoundKind_Interface; compound->m_name = member->m_name; compound->m_id = member->m_id; compound->m_groupCompound = member->m_groupCompound; sl::takeOver(&compound->m_briefDescription, &member->m_briefDescription); sl::takeOver(&compound->m_detailedDescription, &member->m_detailedDescription); - compound->m_selfNamespace = AXL_MEM_NEW(Namespace); + compound->m_selfNamespace = new Namespace; compound->m_selfNamespace->m_compound = compound; m_namespaceList.insertTail(compound->m_selfNamespace); module->m_compoundList.insertTail(compound);