Coding - Refactor HArray and HSequence Definitions (#962)

- Replaced custom DEFINE_HARRAY1 and DEFINE_HSEQUENCE macros with typedefs to NCollection_HArray1 and NCollection_HSequence for various data types across multiple files. - Updated header files in the following modules: - HLRAlgo - TKShHealing - TKBRep - TKG2d - TKG3d - TKGeomBase - TKMeshVS - TKV3d - This change improves consistency and reduces the complexity of the codebase by utilizing the standard NCollection templates.
2026-09-05 04:07:58 +08:00 · 2025-12-28 11:42:24 +00:00
parent 4c975e6a62
commit b5d2fc73fb
289 changed files with 1133 additions and 1341 deletions
@@ -0,0 +1,326 @@
+#!/usr/bin/env python3
+"""
+Migration script for OCCT H-collection macros to templates.
+
+This script converts files using DEFINE_HARRAY1, DEFINE_HARRAY2, and DEFINE_HSEQUENCE
+macros to use the new NCollection_HArray1, NCollection_HArray2, and NCollection_HSequence
+template classes with typedef aliases.
+
+Usage:
+    python3 migrate_hcollections.py [--dry-run] [--verbose]
+"""
+
+import os
+import re
+import sys
+import argparse
+from pathlib import Path
+from typing import Optional, Tuple, Dict, List
+
+# Root of the OCCT source tree
+OCCT_ROOT = Path(__file__).parent.parent.parent.parent
+
+# Regex patterns for macro detection (single-line)
+DEFINE_HARRAY1_PATTERN = re.compile(r'^\s*DEFINE_HARRAY1\s*\(\s*(\w+)\s*,\s*(\w+)\s*\)\s*;?\s*$', re.MULTILINE)
+DEFINE_HARRAY2_PATTERN = re.compile(r'^\s*DEFINE_HARRAY2\s*\(\s*(\w+)\s*,\s*(\w+)\s*\)\s*;?\s*$', re.MULTILINE)
+DEFINE_HSEQUENCE_PATTERN = re.compile(r'^\s*DEFINE_HSEQUENCE\s*\(\s*(\w+)\s*,\s*(\w+)\s*\)\s*;?\s*$', re.MULTILINE)
+
+# Regex patterns for multi-line macros
+DEFINE_HARRAY1_MULTILINE_PATTERN = re.compile(
+    r'^\s*DEFINE_HARRAY1\s*\(\s*(\w+)\s*,\s*\n\s*(\w+)\s*\)\s*;?\s*$', re.MULTILINE)
+DEFINE_HARRAY2_MULTILINE_PATTERN = re.compile(
+    r'^\s*DEFINE_HARRAY2\s*\(\s*(\w+)\s*,\s*\n\s*(\w+)\s*\)\s*;?\s*$', re.MULTILINE)
+DEFINE_HSEQUENCE_MULTILINE_PATTERN = re.compile(
+    r'^\s*DEFINE_HSEQUENCE\s*\(\s*(\w+)\s*,\s*\n\s*(\w+)\s*\)\s*;?\s*$', re.MULTILINE)
+
+# Regex patterns for macros with direct NCollection_Array/Sequence types
+DEFINE_HARRAY1_DIRECT_PATTERN = re.compile(
+    r'^\s*DEFINE_HARRAY1\s*\(\s*(\w+)\s*,\s*NCollection_Array1\s*<\s*(.+?)\s*>\s*\)\s*;?\s*$', re.MULTILINE)
+DEFINE_HARRAY2_DIRECT_PATTERN = re.compile(
+    r'^\s*DEFINE_HARRAY2\s*\(\s*(\w+)\s*,\s*NCollection_Array2\s*<\s*(.+?)\s*>\s*\)\s*;?\s*$', re.MULTILINE)
+DEFINE_HSEQUENCE_DIRECT_PATTERN = re.compile(
+    r'^\s*DEFINE_HSEQUENCE\s*\(\s*(\w+)\s*,\s*NCollection_Sequence\s*<\s*(.+?)\s*>\s*\)\s*;?\s*$', re.MULTILINE)
+
+# Pattern to find element type from underlying array/sequence typedefs
+ARRAY1_TYPEDEF_PATTERN = re.compile(r'typedef\s+NCollection_Array1\s*<\s*(.+?)\s*>\s*(\w+)\s*;')
+ARRAY2_TYPEDEF_PATTERN = re.compile(r'typedef\s+NCollection_Array2\s*<\s*(.+?)\s*>\s*(\w+)\s*;')
+SEQUENCE_TYPEDEF_PATTERN = re.compile(r'typedef\s+NCollection_Sequence\s*<\s*(.+?)\s*>\s*(\w+)\s*;')
+
+# Cache for element type lookups
+element_type_cache: Dict[str, str] = {}
+
+
+def find_element_type(underlying_type: str, collection_kind: str) -> Optional[str]:
+    """
+    Find the element type for an underlying array/sequence type.
+
+    Args:
+        underlying_type: The underlying type name (e.g., 'TColStd_Array1OfReal')
+        collection_kind: 'Array1', 'Array2', or 'Sequence'
+
+    Returns:
+        The element type or None if not found
+    """
+    if underlying_type in element_type_cache:
+        return element_type_cache[underlying_type]
+
+    # Search for the typedef in the source tree
+    src_dir = OCCT_ROOT / 'src'
+
+    if collection_kind == 'Array1':
+        pattern = ARRAY1_TYPEDEF_PATTERN
+    elif collection_kind == 'Array2':
+        pattern = ARRAY2_TYPEDEF_PATTERN
+    else:
+        pattern = SEQUENCE_TYPEDEF_PATTERN
+
+    # Walk through all .hxx files
+    for root, dirs, files in os.walk(src_dir):
+        for filename in files:
+            if filename.endswith('.hxx'):
+                filepath = Path(root) / filename
+                try:
+                    content = filepath.read_text(encoding='utf-8', errors='ignore')
+                    for match in pattern.finditer(content):
+                        element_type = match.group(1).strip()
+                        type_name = match.group(2).strip()
+                        element_type_cache[type_name] = element_type
+                        if type_name == underlying_type:
+                            return element_type
+                except Exception:
+                    continue
+
+    return element_type_cache.get(underlying_type)
+
+
+def get_new_template_header(collection_kind: str) -> str:
+    """Get the new template header file name."""
+    if collection_kind == 'Array1':
+        return 'NCollection_HArray1.hxx'
+    elif collection_kind == 'Array2':
+        return 'NCollection_HArray2.hxx'
+    else:
+        return 'NCollection_HSequence.hxx'
+
+
+def get_new_template_class(collection_kind: str) -> str:
+    """Get the new template class name."""
+    if collection_kind == 'Array1':
+        return 'NCollection_HArray1'
+    elif collection_kind == 'Array2':
+        return 'NCollection_HArray2'
+    else:
+        return 'NCollection_HSequence'
+
+
+def migrate_file(filepath: Path, dry_run: bool = False, verbose: bool = False) -> bool:
+    """
+    Migrate a single file from macro-based to template-based H-collection.
+
+    Returns True if the file was modified.
+    """
+    try:
+        content = filepath.read_text(encoding='utf-8')
+    except Exception as e:
+        print(f"Error reading {filepath}: {e}", file=sys.stderr)
+        return False
+
+    original_content = content
+    modified = False
+
+    # Check for each macro type (standard single-line patterns)
+    for pattern, collection_kind, old_include in [
+        (DEFINE_HARRAY1_PATTERN, 'Array1', 'NCollection_DefineHArray1.hxx'),
+        (DEFINE_HARRAY2_PATTERN, 'Array2', 'NCollection_DefineHArray2.hxx'),
+        (DEFINE_HSEQUENCE_PATTERN, 'Sequence', 'NCollection_DefineHSequence.hxx'),
+    ]:
+        match = pattern.search(content)
+        if match:
+            class_name = match.group(1)
+            underlying_type = match.group(2)
+
+            # Find the element type
+            element_type = find_element_type(underlying_type, collection_kind)
+
+            if element_type is None:
+                print(f"Warning: Could not find element type for {underlying_type} in {filepath}",
+                      file=sys.stderr)
+                continue
+
+            new_template_header = get_new_template_header(collection_kind)
+            new_template_class = get_new_template_class(collection_kind)
+
+            # Build new typedef line
+            new_typedef = f"typedef {new_template_class}<{element_type}> {class_name};"
+
+            if verbose:
+                print(f"  {filepath.name}:")
+                print(f"    Macro: DEFINE_H{collection_kind.upper()}({class_name}, {underlying_type})")
+                print(f"    Element type: {element_type}")
+                print(f"    New typedef: {new_typedef}")
+
+            # Replace the macro with typedef
+            content = pattern.sub(new_typedef, content)
+
+            # Replace the old include with the new one
+            content = content.replace(f'#include <{old_include}>', f'#include <{new_template_header}>')
+
+            modified = True
+
+    # Check for multi-line macro patterns
+    for pattern, collection_kind, old_include in [
+        (DEFINE_HARRAY1_MULTILINE_PATTERN, 'Array1', 'NCollection_DefineHArray1.hxx'),
+        (DEFINE_HARRAY2_MULTILINE_PATTERN, 'Array2', 'NCollection_DefineHArray2.hxx'),
+        (DEFINE_HSEQUENCE_MULTILINE_PATTERN, 'Sequence', 'NCollection_DefineHSequence.hxx'),
+    ]:
+        match = pattern.search(content)
+        if match:
+            class_name = match.group(1)
+            underlying_type = match.group(2)
+
+            element_type = find_element_type(underlying_type, collection_kind)
+
+            if element_type is None:
+                print(f"Warning: Could not find element type for {underlying_type} in {filepath}",
+                      file=sys.stderr)
+                continue
+
+            new_template_header = get_new_template_header(collection_kind)
+            new_template_class = get_new_template_class(collection_kind)
+            new_typedef = f"typedef {new_template_class}<{element_type}> {class_name};"
+
+            if verbose:
+                print(f"  {filepath.name}: (multi-line)")
+                print(f"    New typedef: {new_typedef}")
+
+            content = pattern.sub(new_typedef, content)
+            content = content.replace(f'#include <{old_include}>', f'#include <{new_template_header}>')
+            modified = True
+
+    # Check for direct NCollection_Array/Sequence types in macro
+    for pattern, collection_kind, old_include in [
+        (DEFINE_HARRAY1_DIRECT_PATTERN, 'Array1', 'NCollection_DefineHArray1.hxx'),
+        (DEFINE_HARRAY2_DIRECT_PATTERN, 'Array2', 'NCollection_DefineHArray2.hxx'),
+        (DEFINE_HSEQUENCE_DIRECT_PATTERN, 'Sequence', 'NCollection_DefineHSequence.hxx'),
+    ]:
+        match = pattern.search(content)
+        if match:
+            class_name = match.group(1)
+            element_type = match.group(2).strip()
+
+            new_template_header = get_new_template_header(collection_kind)
+            new_template_class = get_new_template_class(collection_kind)
+            new_typedef = f"typedef {new_template_class}<{element_type}> {class_name};"
+
+            if verbose:
+                print(f"  {filepath.name}: (direct type)")
+                print(f"    Element type: {element_type}")
+                print(f"    New typedef: {new_typedef}")
+
+            content = pattern.sub(new_typedef, content)
+            content = content.replace(f'#include <{old_include}>', f'#include <{new_template_header}>')
+            modified = True
+
+    if modified and content != original_content:
+        if not dry_run:
+            try:
+                filepath.write_text(content, encoding='utf-8')
+                if verbose:
+                    print(f"  Modified: {filepath}")
+            except Exception as e:
+                print(f"Error writing {filepath}: {e}", file=sys.stderr)
+                return False
+        else:
+            print(f"Would modify: {filepath}")
+        return True
+
+    return False
+
+
+def find_macro_files() -> List[Path]:
+    """Find all files containing DEFINE_HARRAY1, DEFINE_HARRAY2, or DEFINE_HSEQUENCE macros."""
+    files = []
+    src_dir = OCCT_ROOT / 'src'
+
+    # All patterns to check
+    all_patterns = [
+        DEFINE_HARRAY1_PATTERN, DEFINE_HARRAY2_PATTERN, DEFINE_HSEQUENCE_PATTERN,
+        DEFINE_HARRAY1_MULTILINE_PATTERN, DEFINE_HARRAY2_MULTILINE_PATTERN, DEFINE_HSEQUENCE_MULTILINE_PATTERN,
+        DEFINE_HARRAY1_DIRECT_PATTERN, DEFINE_HARRAY2_DIRECT_PATTERN, DEFINE_HSEQUENCE_DIRECT_PATTERN,
+    ]
+
+    for root, dirs, filenames in os.walk(src_dir):
+        for filename in filenames:
+            if filename.endswith('.hxx'):
+                filepath = Path(root) / filename
+                try:
+                    content = filepath.read_text(encoding='utf-8', errors='ignore')
+                    if any(p.search(content) for p in all_patterns):
+                        files.append(filepath)
+                except Exception:
+                    continue
+
+    return sorted(files)
+
+
+def build_element_type_cache():
+    """Pre-build the element type cache by scanning all typedef files."""
+    print("Building element type cache...")
+    src_dir = OCCT_ROOT / 'src'
+
+    patterns = [
+        (ARRAY1_TYPEDEF_PATTERN, 'Array1'),
+        (ARRAY2_TYPEDEF_PATTERN, 'Array2'),
+        (SEQUENCE_TYPEDEF_PATTERN, 'Sequence'),
+    ]
+
+    for root, dirs, files in os.walk(src_dir):
+        for filename in files:
+            if filename.endswith('.hxx'):
+                filepath = Path(root) / filename
+                try:
+                    content = filepath.read_text(encoding='utf-8', errors='ignore')
+                    for pattern, kind in patterns:
+                        for match in pattern.finditer(content):
+                            element_type = match.group(1).strip()
+                            type_name = match.group(2).strip()
+                            element_type_cache[type_name] = element_type
+                except Exception:
+                    continue
+
+    print(f"  Found {len(element_type_cache)} type definitions")
+
+
+def main():
+    parser = argparse.ArgumentParser(
+        description='Migrate OCCT H-collection macros to templates')
+    parser.add_argument('--dry-run', action='store_true',
+                        help='Show what would be done without making changes')
+    parser.add_argument('--verbose', '-v', action='store_true',
+                        help='Show detailed output')
+    parser.add_argument('--file', type=str,
+                        help='Migrate only a specific file')
+    args = parser.parse_args()
+
+    # Build the element type cache first
+    build_element_type_cache()
+
+    if args.file:
+        files = [Path(args.file)]
+    else:
+        files = find_macro_files()
+
+    print(f"Found {len(files)} files with H-collection macros")
+
+    modified_count = 0
+    for filepath in files:
+        if migrate_file(filepath, args.dry_run, args.verbose):
+            modified_count += 1
+
+    print(f"\n{'Would modify' if args.dry_run else 'Modified'} {modified_count} files")
+
+    return 0
+
+
+if __name__ == '__main__':
+    sys.exit(main())
@@ -18,8 +18,6 @@

 #include <gp_Trsf.hxx>
 #include <TDataXtd_Array1OfTrsf.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(TDataXtd_HArray1OfTrsf, TDataXtd_Array1OfTrsf)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<gp_Trsf> TDataXtd_HArray1OfTrsf;
 #endif
@@ -18,8 +18,6 @@

 #include <TDF_Attribute.hxx>
 #include <TDF_AttributeArray1.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(TDF_HAttributeArray1, TDF_AttributeArray1)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(TDF_Attribute)> TDF_HAttributeArray1;
 #endif
@@ -19,8 +19,6 @@

 #include <TDF_Label.hxx>
 #include <TDataStd_LabelArray1.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(TDataStd_HLabelArray1, TDataStd_LabelArray1)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<TDF_Label> TDataStd_HLabelArray1;
 #endif
@@ -18,8 +18,6 @@
 #define TFunction_HArray1OfDataMapOfGUIDDriver_HeaderFile

 #include <TFunction_Array1OfDataMapOfGUIDDriver.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(TFunction_HArray1OfDataMapOfGUIDDriver, TFunction_Array1OfDataMapOfGUIDDriver)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<TFunction_DataMapOfGUIDDriver> TFunction_HArray1OfDataMapOfGUIDDriver;
 #endif
@@ -17,9 +17,9 @@
 #include <StdLPersistent_HArray1.hxx>
 #include <StdObject_Shape.hxx>

-#include <NCollection_DefineHArray1.hxx>
+#include <NCollection_HArray1.hxx>

-DEFINE_HARRAY1(StdPersistent_HArray1OfShape1, NCollection_Array1<StdObject_Shape>)
+typedef NCollection_HArray1<StdObject_Shape> StdPersistent_HArray1OfShape1;

 class StdPersistent_HArray1 : private StdLPersistent_HArray1
 {
@@ -15,8 +15,6 @@
 #define StdStorage_HSequenceOfRoots_HeaderFile

 #include <StdStorage_SequenceOfRoots.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(StdStorage_HSequenceOfRoots, StdStorage_SequenceOfRoots)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<Handle(StdStorage_Root)> StdStorage_HSequenceOfRoots;
 #endif // StdStorage_HSequenceOfRoots_HeaderFile
@@ -21,11 +21,12 @@
 #include <StdObjMgt_ReadData.hxx>
 #include <StdObjMgt_WriteData.hxx>

+#include <NCollection_HArray1.hxx>
 #include <TColStd_HArray1OfInteger.hxx>
 #include <TColStd_HArray1OfReal.hxx>
 #include <TColStd_HArray1OfByte.hxx>

-DEFINE_HARRAY1(StdLPersistent_HArray1OfPersistent, NCollection_Array1<Handle(StdObjMgt_Persistent)>)
+typedef NCollection_HArray1<Handle(StdObjMgt_Persistent)> StdLPersistent_HArray1OfPersistent;

 class StdLPersistent_HArray1
 {
@@ -21,10 +21,11 @@
 #include <StdObjMgt_ReadData.hxx>
 #include <StdObjMgt_WriteData.hxx>

+#include <NCollection_HArray2.hxx>
 #include <TColStd_HArray2OfInteger.hxx>
 #include <TColStd_HArray2OfReal.hxx>

-DEFINE_HARRAY2(StdLPersistent_HArray2OfPersistent, NCollection_Array2<Handle(StdObjMgt_Persistent)>)
+typedef NCollection_HArray2<Handle(StdObjMgt_Persistent)> StdLPersistent_HArray2OfPersistent;

 class StdLPersistent_HArray2
 {
@@ -19,11 +19,9 @@
 #define TObj_SequenceOfObject_HeaderFile

 #include <NCollection_Sequence.hxx>
-#include <NCollection_DefineHSequence.hxx>
+#include <NCollection_HSequence.hxx>

 class TObj_Object;
-typedef NCollection_Sequence<Handle(TObj_Object)> TObj_SequenceOfObject;
-
-DEFINE_HSEQUENCE(TObj_HSequenceOfObject, TObj_SequenceOfObject)
-
+typedef NCollection_Sequence<Handle(TObj_Object)>  TObj_SequenceOfObject;
+typedef NCollection_HSequence<Handle(TObj_Object)> TObj_HSequenceOfObject;
 #endif
@@ -18,8 +18,6 @@
 #define IGESAppli_HArray1OfFiniteElement_HeaderFile

 #include <IGESAppli_Array1OfFiniteElement.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(IGESAppli_HArray1OfFiniteElement, IGESAppli_Array1OfFiniteElement)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(IGESAppli_FiniteElement)> IGESAppli_HArray1OfFiniteElement;
 #endif
@@ -19,8 +19,6 @@

 #include <IGESAppli_Flow.hxx>
 #include <IGESAppli_Array1OfFlow.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(IGESAppli_HArray1OfFlow, IGESAppli_Array1OfFlow)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(IGESAppli_Flow)> IGESAppli_HArray1OfFlow;
 #endif
@@ -18,8 +18,6 @@
 #define IGESAppli_HArray1OfNode_HeaderFile

 #include <IGESAppli_Array1OfNode.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(IGESAppli_HArray1OfNode, IGESAppli_Array1OfNode)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(IGESAppli_Node)> IGESAppli_HArray1OfNode;
 #endif
@@ -19,8 +19,6 @@

 #include <IGESData_LineFontEntity.hxx>
 #include <IGESBasic_Array1OfLineFontEntity.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(IGESBasic_HArray1OfLineFontEntity, IGESBasic_Array1OfLineFontEntity)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(IGESData_LineFontEntity)> IGESBasic_HArray1OfLineFontEntity;
 #endif
@@ -18,8 +18,6 @@
 #define IGESBasic_HArray2OfHArray1OfReal_HeaderFile

 #include <IGESBasic_Array2OfHArray1OfReal.hxx>
-#include <NCollection_DefineHArray2.hxx>
-
-DEFINE_HARRAY2(IGESBasic_HArray2OfHArray1OfReal, IGESBasic_Array2OfHArray1OfReal)
-
+#include <NCollection_HArray2.hxx>
+typedef NCollection_HArray2<Handle(TColStd_HArray1OfReal)> IGESBasic_HArray2OfHArray1OfReal;
 #endif
@@ -18,8 +18,6 @@
 #define IGESData_HArray1OfIGESEntity_HeaderFile

 #include <IGESData_Array1OfIGESEntity.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(IGESData_HArray1OfIGESEntity, IGESData_Array1OfIGESEntity)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(IGESData_IGESEntity)> IGESData_HArray1OfIGESEntity;
 #endif
@@ -18,8 +18,6 @@
 #define IGESDefs_HArray1OfTabularData_HeaderFile

 #include <IGESDefs_Array1OfTabularData.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(IGESDefs_HArray1OfTabularData, IGESDefs_Array1OfTabularData)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(IGESDefs_TabularData)> IGESDefs_HArray1OfTabularData;
 #endif
@@ -18,8 +18,6 @@
 #define IGESDimen_HArray1OfGeneralNote_HeaderFile

 #include <IGESDimen_Array1OfGeneralNote.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(IGESDimen_HArray1OfGeneralNote, IGESDimen_Array1OfGeneralNote)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(IGESDimen_GeneralNote)> IGESDimen_HArray1OfGeneralNote;
 #endif
@@ -18,8 +18,6 @@
 #define IGESDimen_HArray1OfLeaderArrow_HeaderFile

 #include <IGESDimen_Array1OfLeaderArrow.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(IGESDimen_HArray1OfLeaderArrow, IGESDimen_Array1OfLeaderArrow)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(IGESDimen_LeaderArrow)> IGESDimen_HArray1OfLeaderArrow;
 #endif
@@ -18,8 +18,6 @@
 #define IGESDraw_HArray1OfConnectPoint_HeaderFile

 #include <IGESDraw_Array1OfConnectPoint.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(IGESDraw_HArray1OfConnectPoint, IGESDraw_Array1OfConnectPoint)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(IGESDraw_ConnectPoint)> IGESDraw_HArray1OfConnectPoint;
 #endif
@@ -18,8 +18,6 @@
 #define IGESDraw_HArray1OfViewKindEntity_HeaderFile

 #include <IGESDraw_Array1OfViewKindEntity.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(IGESDraw_HArray1OfViewKindEntity, IGESDraw_Array1OfViewKindEntity)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(IGESData_ViewKindEntity)> IGESDraw_HArray1OfViewKindEntity;
 #endif
@@ -18,8 +18,6 @@
 #define IGESGeom_HArray1OfBoundary_HeaderFile

 #include <IGESGeom_Array1OfBoundary.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(IGESGeom_HArray1OfBoundary, IGESGeom_Array1OfBoundary)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(IGESGeom_Boundary)> IGESGeom_HArray1OfBoundary;
 #endif
@@ -18,8 +18,6 @@
 #define IGESGeom_HArray1OfCurveOnSurface_HeaderFile

 #include <IGESGeom_Array1OfCurveOnSurface.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(IGESGeom_HArray1OfCurveOnSurface, IGESGeom_Array1OfCurveOnSurface)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(IGESGeom_CurveOnSurface)> IGESGeom_HArray1OfCurveOnSurface;
 #endif
@@ -18,8 +18,7 @@
 #define IGESGeom_HArray1OfTransformationMatrix_HeaderFile

 #include <IGESGeom_Array1OfTransformationMatrix.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(IGESGeom_HArray1OfTransformationMatrix, IGESGeom_Array1OfTransformationMatrix)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(IGESGeom_TransformationMatrix)>
+  IGESGeom_HArray1OfTransformationMatrix;
 #endif
@@ -18,8 +18,6 @@
 #define IGESGraph_HArray1OfColor_HeaderFile

 #include <IGESGraph_Array1OfColor.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(IGESGraph_HArray1OfColor, IGESGraph_Array1OfColor)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(IGESGraph_Color)> IGESGraph_HArray1OfColor;
 #endif
@@ -18,8 +18,7 @@
 #define IGESGraph_HArray1OfTextDisplayTemplate_HeaderFile

 #include <IGESGraph_Array1OfTextDisplayTemplate.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(IGESGraph_HArray1OfTextDisplayTemplate, IGESGraph_Array1OfTextDisplayTemplate)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(IGESGraph_TextDisplayTemplate)>
+  IGESGraph_HArray1OfTextDisplayTemplate;
 #endif
@@ -18,8 +18,6 @@
 #define IGESGraph_HArray1OfTextFontDef_HeaderFile

 #include <IGESGraph_Array1OfTextFontDef.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(IGESGraph_HArray1OfTextFontDef, IGESGraph_Array1OfTextFontDef)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(IGESGraph_TextFontDef)> IGESGraph_HArray1OfTextFontDef;
 #endif
@@ -18,8 +18,6 @@
 #define IGESSolid_HArray1OfFace_HeaderFile

 #include <IGESSolid_Array1OfFace.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(IGESSolid_HArray1OfFace, IGESSolid_Array1OfFace)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(IGESSolid_Face)> IGESSolid_HArray1OfFace;
 #endif
@@ -18,8 +18,6 @@
 #define IGESSolid_HArray1OfLoop_HeaderFile

 #include <IGESSolid_Array1OfLoop.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(IGESSolid_HArray1OfLoop, IGESSolid_Array1OfLoop)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(IGESSolid_Loop)> IGESSolid_HArray1OfLoop;
 #endif
@@ -18,8 +18,6 @@
 #define IGESSolid_HArray1OfShell_HeaderFile

 #include <IGESSolid_Array1OfShell.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(IGESSolid_HArray1OfShell, IGESSolid_Array1OfShell)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(IGESSolid_Shell)> IGESSolid_HArray1OfShell;
 #endif
@@ -18,8 +18,6 @@
 #define IGESSolid_HArray1OfVertexList_HeaderFile

 #include <IGESSolid_Array1OfVertexList.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(IGESSolid_HArray1OfVertexList, IGESSolid_Array1OfVertexList)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(IGESSolid_VertexList)> IGESSolid_HArray1OfVertexList;
 #endif
@@ -18,8 +18,7 @@
 #define STEPSelections_HSequenceOfAssemblyLink_HeaderFile

 #include <STEPSelections_SequenceOfAssemblyLink.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(STEPSelections_HSequenceOfAssemblyLink, STEPSelections_SequenceOfAssemblyLink)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<Handle(STEPSelections_AssemblyLink)>
+  STEPSelections_HSequenceOfAssemblyLink;
 #endif
@@ -18,8 +18,6 @@
 #define StepAP203_HArray1OfApprovedItem_HeaderFile

 #include <StepAP203_Array1OfApprovedItem.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepAP203_HArray1OfApprovedItem, StepAP203_Array1OfApprovedItem)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepAP203_ApprovedItem> StepAP203_HArray1OfApprovedItem;
 #endif
@@ -18,8 +18,6 @@
 #define StepAP203_HArray1OfCertifiedItem_HeaderFile

 #include <StepAP203_Array1OfCertifiedItem.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepAP203_HArray1OfCertifiedItem, StepAP203_Array1OfCertifiedItem)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepAP203_CertifiedItem> StepAP203_HArray1OfCertifiedItem;
 #endif
@@ -18,8 +18,6 @@
 #define StepAP203_HArray1OfChangeRequestItem_HeaderFile

 #include <StepAP203_Array1OfChangeRequestItem.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepAP203_HArray1OfChangeRequestItem, StepAP203_Array1OfChangeRequestItem)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepAP203_ChangeRequestItem> StepAP203_HArray1OfChangeRequestItem;
 #endif
@@ -18,8 +18,6 @@
 #define StepAP203_HArray1OfClassifiedItem_HeaderFile

 #include <StepAP203_Array1OfClassifiedItem.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepAP203_HArray1OfClassifiedItem, StepAP203_Array1OfClassifiedItem)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepAP203_ClassifiedItem> StepAP203_HArray1OfClassifiedItem;
 #endif
@@ -18,8 +18,6 @@
 #define StepAP203_HArray1OfContractedItem_HeaderFile

 #include <StepAP203_Array1OfContractedItem.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepAP203_HArray1OfContractedItem, StepAP203_Array1OfContractedItem)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepAP203_ContractedItem> StepAP203_HArray1OfContractedItem;
 #endif
@@ -18,8 +18,6 @@
 #define StepAP203_HArray1OfDateTimeItem_HeaderFile

 #include <StepAP203_Array1OfDateTimeItem.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepAP203_HArray1OfDateTimeItem, StepAP203_Array1OfDateTimeItem)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepAP203_DateTimeItem> StepAP203_HArray1OfDateTimeItem;
 #endif
@@ -18,8 +18,7 @@
 #define StepAP203_HArray1OfPersonOrganizationItem_HeaderFile

 #include <StepAP203_Array1OfPersonOrganizationItem.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepAP203_HArray1OfPersonOrganizationItem, StepAP203_Array1OfPersonOrganizationItem)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepAP203_PersonOrganizationItem>
+  StepAP203_HArray1OfPersonOrganizationItem;
 #endif
@@ -18,8 +18,6 @@
 #define StepAP203_HArray1OfSpecifiedItem_HeaderFile

 #include <StepAP203_Array1OfSpecifiedItem.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepAP203_HArray1OfSpecifiedItem, StepAP203_Array1OfSpecifiedItem)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepAP203_SpecifiedItem> StepAP203_HArray1OfSpecifiedItem;
 #endif
@@ -18,8 +18,6 @@
 #define StepAP203_HArray1OfStartRequestItem_HeaderFile

 #include <StepAP203_Array1OfStartRequestItem.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepAP203_HArray1OfStartRequestItem, StepAP203_Array1OfStartRequestItem)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepAP203_StartRequestItem> StepAP203_HArray1OfStartRequestItem;
 #endif
@@ -18,8 +18,6 @@
 #define StepAP203_HArray1OfWorkItem_HeaderFile

 #include <StepAP203_Array1OfWorkItem.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepAP203_HArray1OfWorkItem, StepAP203_Array1OfWorkItem)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepAP203_WorkItem> StepAP203_HArray1OfWorkItem;
 #endif
@@ -18,8 +18,6 @@
 #define StepAP214_HArray1OfApprovalItem_HeaderFile

 #include <StepAP214_Array1OfApprovalItem.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepAP214_HArray1OfApprovalItem, StepAP214_Array1OfApprovalItem)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepAP214_ApprovalItem> StepAP214_HArray1OfApprovalItem;
 #endif
@@ -18,9 +18,7 @@
 #define StepAP214_HArray1OfAutoDesignDateAndPersonItem_HeaderFile

 #include <StepAP214_Array1OfAutoDesignDateAndPersonItem.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepAP214_HArray1OfAutoDesignDateAndPersonItem,
-               StepAP214_Array1OfAutoDesignDateAndPersonItem)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepAP214_AutoDesignDateAndPersonItem>
+  StepAP214_HArray1OfAutoDesignDateAndPersonItem;
 #endif
@@ -18,9 +18,7 @@
 #define StepAP214_HArray1OfAutoDesignDateAndTimeItem_HeaderFile

 #include <StepAP214_Array1OfAutoDesignDateAndTimeItem.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepAP214_HArray1OfAutoDesignDateAndTimeItem,
-               StepAP214_Array1OfAutoDesignDateAndTimeItem)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepAP214_AutoDesignDateAndTimeItem>
+  StepAP214_HArray1OfAutoDesignDateAndTimeItem;
 #endif
@@ -18,8 +18,6 @@
 #define StepAP214_HArray1OfAutoDesignDatedItem_HeaderFile

 #include <StepAP214_Array1OfAutoDesignDatedItem.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepAP214_HArray1OfAutoDesignDatedItem, StepAP214_Array1OfAutoDesignDatedItem)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepAP214_AutoDesignDatedItem> StepAP214_HArray1OfAutoDesignDatedItem;
 #endif
@@ -18,9 +18,7 @@
 #define StepAP214_HArray1OfAutoDesignGeneralOrgItem_HeaderFile

 #include <StepAP214_Array1OfAutoDesignGeneralOrgItem.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepAP214_HArray1OfAutoDesignGeneralOrgItem,
-               StepAP214_Array1OfAutoDesignGeneralOrgItem)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepAP214_AutoDesignGeneralOrgItem>
+  StepAP214_HArray1OfAutoDesignGeneralOrgItem;
 #endif
@@ -18,8 +18,7 @@
 #define StepAP214_HArray1OfAutoDesignGroupedItem_HeaderFile

 #include <StepAP214_Array1OfAutoDesignGroupedItem.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepAP214_HArray1OfAutoDesignGroupedItem, StepAP214_Array1OfAutoDesignGroupedItem)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepAP214_AutoDesignGroupedItem>
+  StepAP214_HArray1OfAutoDesignGroupedItem;
 #endif
@@ -18,9 +18,7 @@
 #define StepAP214_HArray1OfAutoDesignPresentedItemSelect_HeaderFile

 #include <StepAP214_Array1OfAutoDesignPresentedItemSelect.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepAP214_HArray1OfAutoDesignPresentedItemSelect,
-               StepAP214_Array1OfAutoDesignPresentedItemSelect)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepAP214_AutoDesignPresentedItemSelect>
+  StepAP214_HArray1OfAutoDesignPresentedItemSelect;
 #endif
@@ -18,9 +18,7 @@
 #define StepAP214_HArray1OfAutoDesignReferencingItem_HeaderFile

 #include <StepAP214_Array1OfAutoDesignReferencingItem.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepAP214_HArray1OfAutoDesignReferencingItem,
-               StepAP214_Array1OfAutoDesignReferencingItem)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepAP214_AutoDesignReferencingItem>
+  StepAP214_HArray1OfAutoDesignReferencingItem;
 #endif
@@ -18,8 +18,6 @@
 #define StepAP214_HArray1OfDateAndTimeItem_HeaderFile

 #include <StepAP214_Array1OfDateAndTimeItem.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepAP214_HArray1OfDateAndTimeItem, StepAP214_Array1OfDateAndTimeItem)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepAP214_DateAndTimeItem> StepAP214_HArray1OfDateAndTimeItem;
 #endif
@@ -18,8 +18,6 @@
 #define StepAP214_HArray1OfDateItem_HeaderFile

 #include <StepAP214_Array1OfDateItem.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepAP214_HArray1OfDateItem, StepAP214_Array1OfDateItem)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepAP214_DateItem> StepAP214_HArray1OfDateItem;
 #endif
@@ -18,8 +18,7 @@
 #define StepAP214_HArray1OfDocumentReferenceItem_HeaderFile

 #include <StepAP214_Array1OfDocumentReferenceItem.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepAP214_HArray1OfDocumentReferenceItem, StepAP214_Array1OfDocumentReferenceItem)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepAP214_DocumentReferenceItem>
+  StepAP214_HArray1OfDocumentReferenceItem;
 #endif
@@ -18,9 +18,7 @@
 #define StepAP214_HArray1OfExternalIdentificationItem_HeaderFile

 #include <StepAP214_Array1OfExternalIdentificationItem.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepAP214_HArray1OfExternalIdentificationItem,
-               StepAP214_Array1OfExternalIdentificationItem)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepAP214_ExternalIdentificationItem>
+  StepAP214_HArray1OfExternalIdentificationItem;
 #endif
@@ -18,8 +18,6 @@
 #define StepAP214_HArray1OfGroupItem_HeaderFile

 #include <StepAP214_Array1OfGroupItem.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepAP214_HArray1OfGroupItem, StepAP214_Array1OfGroupItem)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepAP214_GroupItem> StepAP214_HArray1OfGroupItem;
 #endif
@@ -18,8 +18,6 @@
 #define StepAP214_HArray1OfOrganizationItem_HeaderFile

 #include <StepAP214_Array1OfOrganizationItem.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepAP214_HArray1OfOrganizationItem, StepAP214_Array1OfOrganizationItem)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepAP214_OrganizationItem> StepAP214_HArray1OfOrganizationItem;
 #endif
@@ -18,9 +18,7 @@
 #define StepAP214_HArray1OfPersonAndOrganizationItem_HeaderFile

 #include <StepAP214_Array1OfPersonAndOrganizationItem.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepAP214_HArray1OfPersonAndOrganizationItem,
-               StepAP214_Array1OfPersonAndOrganizationItem)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepAP214_PersonAndOrganizationItem>
+  StepAP214_HArray1OfPersonAndOrganizationItem;
 #endif
@@ -18,8 +18,6 @@
 #define StepAP214_HArray1OfPresentedItemSelect_HeaderFile

 #include <StepAP214_Array1OfPresentedItemSelect.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepAP214_HArray1OfPresentedItemSelect, StepAP214_Array1OfPresentedItemSelect)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepAP214_PresentedItemSelect> StepAP214_HArray1OfPresentedItemSelect;
 #endif
@@ -18,9 +18,7 @@
 #define StepAP214_HArray1OfSecurityClassificationItem_HeaderFile

 #include <StepAP214_Array1OfSecurityClassificationItem.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepAP214_HArray1OfSecurityClassificationItem,
-               StepAP214_Array1OfSecurityClassificationItem)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepAP214_SecurityClassificationItem>
+  StepAP214_HArray1OfSecurityClassificationItem;
 #endif
@@ -18,8 +18,6 @@
 #define StepBasic_HArray1OfApproval_HeaderFile

 #include <StepBasic_Array1OfApproval.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepBasic_HArray1OfApproval, StepBasic_Array1OfApproval)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepBasic_Approval)> StepBasic_HArray1OfApproval;
 #endif
@@ -18,8 +18,7 @@
 #define StepBasic_HArray1OfDerivedUnitElement_HeaderFile

 #include <StepBasic_Array1OfDerivedUnitElement.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepBasic_HArray1OfDerivedUnitElement, StepBasic_Array1OfDerivedUnitElement)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepBasic_DerivedUnitElement)>
+  StepBasic_HArray1OfDerivedUnitElement;
 #endif
@@ -18,8 +18,6 @@
 #define StepBasic_HArray1OfDocument_HeaderFile

 #include <StepBasic_Array1OfDocument.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepBasic_HArray1OfDocument, StepBasic_Array1OfDocument)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepBasic_Document)> StepBasic_HArray1OfDocument;
 #endif
@@ -18,8 +18,6 @@
 #define StepBasic_HArray1OfNamedUnit_HeaderFile

 #include <StepBasic_Array1OfNamedUnit.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepBasic_HArray1OfNamedUnit, StepBasic_Array1OfNamedUnit)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepBasic_NamedUnit)> StepBasic_HArray1OfNamedUnit;
 #endif
@@ -18,8 +18,6 @@
 #define StepBasic_HArray1OfOrganization_HeaderFile

 #include <StepBasic_Array1OfOrganization.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepBasic_HArray1OfOrganization, StepBasic_Array1OfOrganization)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepBasic_Organization)> StepBasic_HArray1OfOrganization;
 #endif
@@ -18,8 +18,6 @@
 #define StepBasic_HArray1OfPerson_HeaderFile

 #include <StepBasic_Array1OfPerson.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepBasic_HArray1OfPerson, StepBasic_Array1OfPerson)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepBasic_Person)> StepBasic_HArray1OfPerson;
 #endif
@@ -18,8 +18,6 @@
 #define StepBasic_HArray1OfProduct_HeaderFile

 #include <StepBasic_Array1OfProduct.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepBasic_HArray1OfProduct, StepBasic_Array1OfProduct)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepBasic_Product)> StepBasic_HArray1OfProduct;
 #endif
@@ -18,8 +18,6 @@
 #define StepBasic_HArray1OfProductContext_HeaderFile

 #include <StepBasic_Array1OfProductContext.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepBasic_HArray1OfProductContext, StepBasic_Array1OfProductContext)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepBasic_ProductContext)> StepBasic_HArray1OfProductContext;
 #endif
@@ -19,8 +19,7 @@

 #include <StepBasic_ProductDefinition.hxx>
 #include <StepBasic_Array1OfProductDefinition.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepBasic_HArray1OfProductDefinition, StepBasic_Array1OfProductDefinition)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepBasic_ProductDefinition)>
+  StepBasic_HArray1OfProductDefinition;
 #endif
@@ -18,9 +18,7 @@
 #define StepBasic_HArray1OfUncertaintyMeasureWithUnit_HeaderFile

 #include <StepBasic_Array1OfUncertaintyMeasureWithUnit.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepBasic_HArray1OfUncertaintyMeasureWithUnit,
-               StepBasic_Array1OfUncertaintyMeasureWithUnit)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepBasic_UncertaintyMeasureWithUnit)>
+  StepBasic_HArray1OfUncertaintyMeasureWithUnit;
 #endif
@@ -18,8 +18,6 @@
 #define StepData_HArray1OfField_HeaderFile

 #include <StepData_Array1OfField.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepData_HArray1OfField, StepData_Array1OfField)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepData_Field> StepData_HArray1OfField;
 #endif
@@ -22,10 +22,13 @@

 #include <Standard_Integer.hxx>
 #include <StepData_SelectType.hxx>
+#include <NCollection_HArray1.hxx>

 class Standard_Transient;
 class StepDimTol_Datum;
-class StepDimTol_HArray1OfDatumReferenceElement;
+class StepDimTol_DatumReferenceElement;
+typedef NCollection_HArray1<Handle(StepDimTol_DatumReferenceElement)>
+  StepDimTol_HArray1OfDatumReferenceElement;

 class StepDimTol_DatumOrCommonDatum : public StepData_SelectType
 {
@@ -20,11 +20,11 @@

 #include <StepBasic_LengthMeasureWithUnit.hxx>
 #include <StepDimTol_GeometricToleranceWithModifiers.hxx>
+#include <StepDimTol_HArray1OfGeometricToleranceModifier.hxx>

 class TCollection_HAsciiString;
 class StepBasic_MeasureWithUnit;
 class StepDimTol_GeometricToleranceTarget;
-class StepDimTol_HArray1OfGeometricToleranceModifier;

 class StepDimTol_GeometricToleranceWithMaximumTolerance;
 DEFINE_STANDARD_HANDLE(StepDimTol_GeometricToleranceWithMaximumTolerance,
@@ -17,8 +17,6 @@
 #define StepDimTol_HArray1OfDatumReference_HeaderFile

 #include <StepDimTol_Array1OfDatumReference.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepDimTol_HArray1OfDatumReference, StepDimTol_Array1OfDatumReference)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepDimTol_DatumReference)> StepDimTol_HArray1OfDatumReference;
 #endif
@@ -17,8 +17,7 @@
 #define _StepDimTol_HArray1OfDatumReferenceCompartment_HeaderFile

 #include <StepDimTol_Array1OfDatumReferenceCompartment.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepDimTol_HArray1OfDatumReferenceCompartment,
-               StepDimTol_Array1OfDatumReferenceCompartment)
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepDimTol_DatumReferenceCompartment)>
+  StepDimTol_HArray1OfDatumReferenceCompartment;
 #endif // _StepDimTol_HArray1OfDatumReferenceCompartment_HeaderFile
@@ -17,7 +17,7 @@
 #define _StepDimTol_HArray1OfDatumReferenceElement_HeaderFile

 #include <StepDimTol_Array1OfDatumReferenceElement.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepDimTol_HArray1OfDatumReferenceElement, StepDimTol_Array1OfDatumReferenceElement)
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepDimTol_DatumReferenceElement)>
+  StepDimTol_HArray1OfDatumReferenceElement;
 #endif // _StepDimTol_HArray1OfDatumReferenceElement_HeaderFile
@@ -18,9 +18,7 @@

 #include <StepDimTol_DatumReferenceModifier.hxx>
 #include <StepDimTol_Array1OfDatumReferenceModifier.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepDimTol_HArray1OfDatumReferenceModifier,
-               StepDimTol_Array1OfDatumReferenceModifier)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepDimTol_DatumReferenceModifier>
+  StepDimTol_HArray1OfDatumReferenceModifier;
 #endif // _StepDimTol_HArray1OfDatumReferenceModifier_HeaderFile
@@ -17,8 +17,7 @@
 #define _StepDimTol_HArray1OfDatumSystemOrReference_HeaderFile

 #include <StepDimTol_Array1OfDatumSystemOrReference.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepDimTol_HArray1OfDatumSystemOrReference,
-               StepDimTol_Array1OfDatumSystemOrReference)
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepDimTol_DatumSystemOrReference>
+  StepDimTol_HArray1OfDatumSystemOrReference;
 #endif // _StepDimTol_HArray1OfDatumSystemOrReference_HeaderFile
@@ -17,8 +17,7 @@
 #define _StepDimTol_HArray1OfGeometricToleranceModifier_HeaderFile

 #include <StepDimTol_Array1OfGeometricToleranceModifier.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepDimTol_HArray1OfGeometricToleranceModifier,
-               StepDimTol_Array1OfGeometricToleranceModifier)
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepDimTol_GeometricToleranceModifier>
+  StepDimTol_HArray1OfGeometricToleranceModifier;
 #endif // _StepDimTol_HArray1OfGeometricToleranceModifier_HeaderFile
@@ -17,7 +17,6 @@
 #define _StepDimTol_HArray1OfToleranceZoneTarget_HeaderFile

 #include <StepDimTol_Array1OfToleranceZoneTarget.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepDimTol_HArray1OfToleranceZoneTarget, StepDimTol_Array1OfToleranceZoneTarget)
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepDimTol_ToleranceZoneTarget> StepDimTol_HArray1OfToleranceZoneTarget;
 #endif // _StepDimTol_HArray1OfToleranceZoneTarget_HeaderFile
@@ -21,8 +21,7 @@
 #include <StepDimTol_RunoutZoneOrientation.hxx>
 #include <StepDimTol_ToleranceZoneDefinition.hxx>
 #include <Standard_Integer.hxx>
-
-class StepRepr_HArray1OfShapeAspect;
+#include <StepRepr_HArray1OfShapeAspect.hxx>

 class StepDimTol_RunoutZoneDefinition;
 DEFINE_STANDARD_HANDLE(StepDimTol_RunoutZoneDefinition, StepDimTol_ToleranceZoneDefinition)
@@ -15,9 +15,7 @@
 #define StepElement_HArray1OfCurveElementEndReleasePacket_HeaderFile

 #include <StepElement_Array1OfCurveElementEndReleasePacket.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepElement_HArray1OfCurveElementEndReleasePacket,
-               StepElement_Array1OfCurveElementEndReleasePacket)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepElement_CurveElementEndReleasePacket)>
+  StepElement_HArray1OfCurveElementEndReleasePacket;
 #endif
@@ -15,9 +15,7 @@
 #define StepElement_HArray1OfCurveElementSectionDefinition_HeaderFile

 #include <StepElement_Array1OfCurveElementSectionDefinition.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepElement_HArray1OfCurveElementSectionDefinition,
-               StepElement_Array1OfCurveElementSectionDefinition)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepElement_CurveElementSectionDefinition)>
+  StepElement_HArray1OfCurveElementSectionDefinition;
 #endif
@@ -16,9 +16,7 @@

 #include <StepElement_HSequenceOfCurveElementPurposeMember.hxx>
 #include <StepElement_Array1OfHSequenceOfCurveElementPurposeMember.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepElement_HArray1OfHSequenceOfCurveElementPurposeMember,
-               StepElement_Array1OfHSequenceOfCurveElementPurposeMember)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepElement_HSequenceOfCurveElementPurposeMember)>
+  StepElement_HArray1OfHSequenceOfCurveElementPurposeMember;
 #endif
@@ -15,9 +15,7 @@
 #define StepElement_HArray1OfHSequenceOfSurfaceElementPurposeMember_HeaderFile

 #include <StepElement_Array1OfHSequenceOfSurfaceElementPurposeMember.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepElement_HArray1OfHSequenceOfSurfaceElementPurposeMember,
-               StepElement_Array1OfHSequenceOfSurfaceElementPurposeMember)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepElement_HSequenceOfSurfaceElementPurposeMember)>
+  StepElement_HArray1OfHSequenceOfSurfaceElementPurposeMember;
 #endif
@@ -15,9 +15,7 @@
 #define StepElement_HArray1OfMeasureOrUnspecifiedValue_HeaderFile

 #include <StepElement_Array1OfMeasureOrUnspecifiedValue.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepElement_HArray1OfMeasureOrUnspecifiedValue,
-               StepElement_Array1OfMeasureOrUnspecifiedValue)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepElement_MeasureOrUnspecifiedValue>
+  StepElement_HArray1OfMeasureOrUnspecifiedValue;
 #endif
@@ -15,8 +15,6 @@
 #define StepElement_HArray1OfSurfaceSection_HeaderFile

 #include <StepElement_Array1OfSurfaceSection.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepElement_HArray1OfSurfaceSection, StepElement_Array1OfSurfaceSection)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepElement_SurfaceSection)> StepElement_HArray1OfSurfaceSection;
 #endif
@@ -16,8 +16,7 @@

 #include <StepElement_VolumeElementPurpose.hxx>
 #include <StepElement_Array1OfVolumeElementPurpose.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepElement_HArray1OfVolumeElementPurpose, StepElement_Array1OfVolumeElementPurpose)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepElement_VolumeElementPurpose>
+  StepElement_HArray1OfVolumeElementPurpose;
 #endif
@@ -15,9 +15,7 @@
 #define StepElement_HArray1OfVolumeElementPurposeMember_HeaderFile

 #include <StepElement_Array1OfVolumeElementPurposeMember.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepElement_HArray1OfVolumeElementPurposeMember,
-               StepElement_Array1OfVolumeElementPurposeMember)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepElement_VolumeElementPurposeMember)>
+  StepElement_HArray1OfVolumeElementPurposeMember;
 #endif
@@ -16,9 +16,7 @@

 #include <StepElement_CurveElementPurposeMember.hxx>
 #include <StepElement_Array2OfCurveElementPurposeMember.hxx>
-#include <NCollection_DefineHArray2.hxx>
-
-DEFINE_HARRAY2(StepElement_HArray2OfCurveElementPurposeMember,
-               StepElement_Array2OfCurveElementPurposeMember)
-
+#include <NCollection_HArray2.hxx>
+typedef NCollection_HArray2<Handle(StepElement_CurveElementPurposeMember)>
+  StepElement_HArray2OfCurveElementPurposeMember;
 #endif
@@ -16,9 +16,7 @@

 #include <StepElement_SurfaceElementPurpose.hxx>
 #include <StepElement_Array2OfSurfaceElementPurpose.hxx>
-#include <NCollection_DefineHArray2.hxx>
-
-DEFINE_HARRAY2(StepElement_HArray2OfSurfaceElementPurpose,
-               StepElement_Array2OfSurfaceElementPurpose)
-
+#include <NCollection_HArray2.hxx>
+typedef NCollection_HArray2<StepElement_SurfaceElementPurpose>
+  StepElement_HArray2OfSurfaceElementPurpose;
 #endif
@@ -16,9 +16,7 @@

 #include <StepElement_SurfaceElementPurposeMember.hxx>
 #include <StepElement_Array2OfSurfaceElementPurposeMember.hxx>
-#include <NCollection_DefineHArray2.hxx>
-
-DEFINE_HARRAY2(StepElement_HArray2OfSurfaceElementPurposeMember,
-               StepElement_Array2OfSurfaceElementPurposeMember)
-
+#include <NCollection_HArray2.hxx>
+typedef NCollection_HArray2<Handle(StepElement_SurfaceElementPurposeMember)>
+  StepElement_HArray2OfSurfaceElementPurposeMember;
 #endif
@@ -16,9 +16,7 @@

 #include <StepElement_CurveElementPurposeMember.hxx>
 #include <StepElement_SequenceOfCurveElementPurposeMember.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(StepElement_HSequenceOfCurveElementPurposeMember,
-                 StepElement_SequenceOfCurveElementPurposeMember)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<Handle(StepElement_CurveElementPurposeMember)>
+  StepElement_HSequenceOfCurveElementPurposeMember;
 #endif
@@ -15,9 +15,7 @@
 #define StepElement_HSequenceOfCurveElementSectionDefinition_HeaderFile

 #include <StepElement_SequenceOfCurveElementSectionDefinition.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(StepElement_HSequenceOfCurveElementSectionDefinition,
-                 StepElement_SequenceOfCurveElementSectionDefinition)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<Handle(StepElement_CurveElementSectionDefinition)>
+  StepElement_HSequenceOfCurveElementSectionDefinition;
 #endif
@@ -15,8 +15,7 @@
 #define StepElement_HSequenceOfElementMaterial_HeaderFile

 #include <StepElement_SequenceOfElementMaterial.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(StepElement_HSequenceOfElementMaterial, StepElement_SequenceOfElementMaterial)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<Handle(StepElement_ElementMaterial)>
+  StepElement_HSequenceOfElementMaterial;
 #endif
@@ -15,9 +15,7 @@
 #define StepElement_HSequenceOfSurfaceElementPurposeMember_HeaderFile

 #include <StepElement_SequenceOfSurfaceElementPurposeMember.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(StepElement_HSequenceOfSurfaceElementPurposeMember,
-                 StepElement_SequenceOfSurfaceElementPurposeMember)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<Handle(StepElement_SurfaceElementPurposeMember)>
+  StepElement_HSequenceOfSurfaceElementPurposeMember;
 #endif
@@ -15,8 +15,7 @@
 #define StepFEA_HArray1OfCurveElementEndOffset_HeaderFile

 #include <StepFEA_Array1OfCurveElementEndOffset.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepFEA_HArray1OfCurveElementEndOffset, StepFEA_Array1OfCurveElementEndOffset)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepFEA_CurveElementEndOffset)>
+  StepFEA_HArray1OfCurveElementEndOffset;
 #endif
@@ -15,8 +15,7 @@
 #define StepFEA_HArray1OfCurveElementEndRelease_HeaderFile

 #include <StepFEA_Array1OfCurveElementEndRelease.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepFEA_HArray1OfCurveElementEndRelease, StepFEA_Array1OfCurveElementEndRelease)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepFEA_CurveElementEndRelease)>
+  StepFEA_HArray1OfCurveElementEndRelease;
 #endif
@@ -16,8 +16,7 @@

 #include <StepFEA_CurveElementInterval.hxx>
 #include <StepFEA_Array1OfCurveElementInterval.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepFEA_HArray1OfCurveElementInterval, StepFEA_Array1OfCurveElementInterval)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepFEA_CurveElementInterval)>
+  StepFEA_HArray1OfCurveElementInterval;
 #endif
@@ -15,8 +15,6 @@
 #define StepFEA_HArray1OfDegreeOfFreedom_HeaderFile

 #include <StepFEA_Array1OfDegreeOfFreedom.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepFEA_HArray1OfDegreeOfFreedom, StepFEA_Array1OfDegreeOfFreedom)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepFEA_DegreeOfFreedom> StepFEA_HArray1OfDegreeOfFreedom;
 #endif
@@ -16,8 +16,7 @@

 #include <StepFEA_ElementRepresentation.hxx>
 #include <StepFEA_Array1OfElementRepresentation.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepFEA_HArray1OfElementRepresentation, StepFEA_Array1OfElementRepresentation)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepFEA_ElementRepresentation)>
+  StepFEA_HArray1OfElementRepresentation;
 #endif
--- a/Show More
+++ b/Show More