remove unused 3rd parameter for AZ_CLASS_ALLOCATOR. (#14530)

Signed-off-by: Jackie9527 <[email protected]>

AutomatedTesting/Gem/Code/Source/AutomatedTestingModule.cpp

@@ -19,7 +19,7 @@ namespace AutomatedTesting
     {
     public:
         AZ_RTTI(AutomatedTestingModule, "{3D6F59F6-013F-46F8-A840-5C2C43FA6AFB}", AZ::Module);
-        AZ_CLASS_ALLOCATOR(AutomatedTestingModule, AZ::SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(AutomatedTestingModule, AZ::SystemAllocator);
 
         AutomatedTestingModule()
             : AZ::Module()

AutomatedTesting/Gem/PythonCoverage/Code/Source/PythonCoverageEditorModule.cpp

@@ -11,7 +11,7 @@
 
 namespace PythonCoverage
 {
-    AZ_CLASS_ALLOCATOR_IMPL(PythonCoverageEditorModule, AZ::SystemAllocator, 0)
+    AZ_CLASS_ALLOCATOR_IMPL(PythonCoverageEditorModule, AZ::SystemAllocator);
 
     PythonCoverageEditorModule::PythonCoverageEditorModule()
     {

Code/Editor/AssetEditor/AssetEditorRequestsHandler.h

@@ -15,7 +15,7 @@ class AssetEditorRequestsHandler
     , public AzToolsFramework::EditorEvents::Bus::Handler
 {
 public:
-    AZ_CLASS_ALLOCATOR(AssetEditorRequestsHandler, AZ::SystemAllocator, 0);
+    AZ_CLASS_ALLOCATOR(AssetEditorRequestsHandler, AZ::SystemAllocator);
 
     AssetEditorRequestsHandler();
     ~AssetEditorRequestsHandler() override;

Code/Editor/AssetEditor/AssetEditorWindow.h

@@ -29,7 +29,7 @@ class AssetEditorWindow
     Q_OBJECT
 
 public:
-    AZ_CLASS_ALLOCATOR(AssetEditorWindow, AZ::SystemAllocator, 0);
+    AZ_CLASS_ALLOCATOR(AssetEditorWindow, AZ::SystemAllocator);
 
     explicit AssetEditorWindow(QWidget* parent = nullptr);
     ~AssetEditorWindow() override;

Code/Editor/AzAssetBrowser/AzAssetBrowserWindow.h

@@ -45,7 +45,7 @@ class AzAssetBrowserWindow : public QWidget
 {
     Q_OBJECT
 public:
-    AZ_CLASS_ALLOCATOR(AzAssetBrowserWindow, AZ::SystemAllocator, 0);
+    AZ_CLASS_ALLOCATOR(AzAssetBrowserWindow, AZ::SystemAllocator);
 
     explicit AzAssetBrowserWindow(QWidget* parent = nullptr);
     virtual ~AzAssetBrowserWindow();

Code/Editor/Controls/ReflectedPropertyControl/PropertyGenericCtrl.h

@@ -29,7 +29,7 @@ class GenericPopupPropertyEditor
 {
     Q_OBJECT
 public:
-    AZ_CLASS_ALLOCATOR(GenericPopupPropertyEditor, AZ::SystemAllocator, 0);
+    AZ_CLASS_ALLOCATOR(GenericPopupPropertyEditor, AZ::SystemAllocator);
     GenericPopupPropertyEditor(QWidget* pParent = nullptr, bool showTwoButtons = false);
 
     void SetValue(const QString& value, bool notify = true);
@@ -56,7 +56,7 @@ class GenericPopupWidgetHandler
     , public AzToolsFramework::PropertyHandler < CReflectedVarGenericProperty, GenericPopupPropertyEditor >
 {
 public:
-    AZ_CLASS_ALLOCATOR(GenericPopupWidgetHandler, AZ::SystemAllocator, 0);
+    AZ_CLASS_ALLOCATOR(GenericPopupWidgetHandler, AZ::SystemAllocator);
     virtual bool IsDefaultHandler() const override { return false; }
 
     virtual AZ::u32 GetHandlerName(void) const override  { return CRC; }
@@ -157,7 +157,7 @@ class ListEditWidget : public QWidget
 {
     Q_OBJECT
 public:
-    AZ_CLASS_ALLOCATOR(ListEditWidget, AZ::SystemAllocator, 0);
+    AZ_CLASS_ALLOCATOR(ListEditWidget, AZ::SystemAllocator);
     ListEditWidget(QWidget *pParent = nullptr);
 
     void SetValue(const QString &value, bool notify = true);
@@ -184,7 +184,7 @@ template <class T, AZ::u32 CRC>
 class ListEditWidgetHandler : public QObject, public AzToolsFramework::PropertyHandler < CReflectedVarGenericProperty, ListEditWidget >
 {
 public:
-    AZ_CLASS_ALLOCATOR(ListEditWidgetHandler, AZ::SystemAllocator, 0);
+    AZ_CLASS_ALLOCATOR(ListEditWidgetHandler, AZ::SystemAllocator);
     virtual bool IsDefaultHandler() const override { return false; }
 
     virtual AZ::u32 GetHandlerName(void) const override  { return CRC; }

Code/Editor/Controls/ReflectedPropertyControl/PropertyMiscCtrl.h

@@ -25,7 +25,7 @@ class UserPropertyEditor : public QWidget
 {
     Q_OBJECT
 public:
-    AZ_CLASS_ALLOCATOR(UserPropertyEditor, AZ::SystemAllocator, 0);
+    AZ_CLASS_ALLOCATOR(UserPropertyEditor, AZ::SystemAllocator);
     UserPropertyEditor(QWidget *pParent = nullptr);
 
     void SetValue(const QString &value, bool notify = true);
@@ -53,7 +53,7 @@ class UserPopupWidgetHandler : public QObject, public AzToolsFramework::Property
 {
     Q_OBJECT
 public:
-    AZ_CLASS_ALLOCATOR(UserPopupWidgetHandler, AZ::SystemAllocator, 0);
+    AZ_CLASS_ALLOCATOR(UserPopupWidgetHandler, AZ::SystemAllocator);
     bool IsDefaultHandler() const override { return false; }
     QWidget* CreateGUI(QWidget *pParent) override;
 
@@ -68,7 +68,7 @@ class FloatCurveHandler : public QObject, public AzToolsFramework::PropertyHandl
 {
     Q_OBJECT
 public:
-    AZ_CLASS_ALLOCATOR(FloatCurveHandler, AZ::SystemAllocator, 0);
+    AZ_CLASS_ALLOCATOR(FloatCurveHandler, AZ::SystemAllocator);
     bool IsDefaultHandler() const override { return false; }
     QWidget* CreateGUI(QWidget *pParent) override;
 

Code/Editor/Controls/ReflectedPropertyControl/PropertyMotionCtrl.h

@@ -24,7 +24,7 @@ class MotionPropertyWidgetHandler : QObject,
     Q_OBJECT
 
 public:
-    AZ_CLASS_ALLOCATOR(MotionPropertyWidgetHandler, AZ::SystemAllocator, 0);
+    AZ_CLASS_ALLOCATOR(MotionPropertyWidgetHandler, AZ::SystemAllocator);
 
     virtual AZ::u32 GetHandlerName(void) const override
     {

Code/Editor/CryEdit.cpp

@@ -2890,7 +2890,7 @@ class SimulationModeCommand
     : public AzToolsFramework::UndoSystem::URSequencePoint
 {
 public:
-    AZ_CLASS_ALLOCATOR(SimulationModeCommand, AZ::SystemAllocator, 0);
+    AZ_CLASS_ALLOCATOR(SimulationModeCommand, AZ::SystemAllocator);
     AZ_RTTI(SimulationModeCommand, "{FB9FB958-5C56-47F6-B168-B5F564F70E69}");
 
     SimulationModeCommand(const AZStd::string& friendlyName);

Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/AssetCatalogModel.h

@@ -45,7 +45,7 @@ public:
     };
 
     AssetCatalogEntry() {}
-    AZ_CLASS_ALLOCATOR(AssetCatalogEntry, AZ::SystemAllocator, 0);
+    AZ_CLASS_ALLOCATOR(AssetCatalogEntry, AZ::SystemAllocator);
 
     bool operator<(const QStandardItem& other) const override;
 
@@ -63,7 +63,7 @@ class AssetCatalogModel
     Q_OBJECT
 
 public:
-    AZ_CLASS_ALLOCATOR(AssetCatalogModel, AZ::SystemAllocator, 0);
+    AZ_CLASS_ALLOCATOR(AssetCatalogModel, AZ::SystemAllocator);
 
     AssetCatalogModel(QObject* parent = 0);
     ~AssetCatalogModel() override;

Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/ComponentPaletteSettings.h

@@ -21,7 +21,7 @@ class ComponentPaletteSettings
     : public AZ::UserSettings
 {
 public:
-    AZ_CLASS_ALLOCATOR(ComponentPaletteSettings, AZ::SystemAllocator, 0);
+    AZ_CLASS_ALLOCATOR(ComponentPaletteSettings, AZ::SystemAllocator);
     AZ_RTTI(ComponentPaletteSettings, "{BAC3BABA-6DF1-4EEE-AFF1-6A84AD1820A1}", AZ::UserSettings);
 
     AZStd::vector<AZ::Uuid> m_favorites;

Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerListModel.hxx

@@ -54,7 +54,7 @@ class OutlinerListModel
     Q_OBJECT;
 
 public:
-    AZ_CLASS_ALLOCATOR(OutlinerListModel, AZ::SystemAllocator, 0);
+    AZ_CLASS_ALLOCATOR(OutlinerListModel, AZ::SystemAllocator);
 
     //! Columns of data to display about each Entity.
     enum Column
@@ -324,7 +324,7 @@ class OutlinerItemDelegate
     : public QStyledItemDelegate
 {
 public:
-    AZ_CLASS_ALLOCATOR(OutlinerItemDelegate, AZ::SystemAllocator, 0);
+    AZ_CLASS_ALLOCATOR(OutlinerItemDelegate, AZ::SystemAllocator);
 
     OutlinerItemDelegate(QWidget* parent = nullptr);
 

Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerSortFilterProxyModel.hxx

@@ -27,7 +27,7 @@ class OutlinerSortFilterProxyModel
     Q_OBJECT
 
 public:
-    AZ_CLASS_ALLOCATOR(OutlinerSortFilterProxyModel, AZ::SystemAllocator, 0);
+    AZ_CLASS_ALLOCATOR(OutlinerSortFilterProxyModel, AZ::SystemAllocator);
 
     OutlinerSortFilterProxyModel(QObject* pParent = nullptr);
 

Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerTreeView.hxx

@@ -36,7 +36,7 @@ class OutlinerTreeView
 {
     Q_OBJECT;
 public:
-    AZ_CLASS_ALLOCATOR(OutlinerTreeView, AZ::SystemAllocator, 0);
+    AZ_CLASS_ALLOCATOR(OutlinerTreeView, AZ::SystemAllocator);
 
     OutlinerTreeView(QWidget* pParent = NULL);
     virtual ~OutlinerTreeView();

Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerWidget.hxx

@@ -63,7 +63,7 @@ class OutlinerWidget
 {
     Q_OBJECT;
 public:
-    AZ_CLASS_ALLOCATOR(OutlinerWidget, AZ::SystemAllocator, 0)
+    AZ_CLASS_ALLOCATOR(OutlinerWidget, AZ::SystemAllocator);
 
     OutlinerWidget(QWidget* pParent = NULL, Qt::WindowFlags flags = Qt::WindowFlags());
     virtual ~OutlinerWidget();

Code/Editor/Plugins/EditorAssetImporter/ImporterRootDisplay.h

@@ -89,7 +89,7 @@ class ImporterRootDisplayWidget
     Q_OBJECT
 
 public:
-    AZ_CLASS_ALLOCATOR(ImporterRootDisplayWidget, AZ::SystemAllocator, 0)
+    AZ_CLASS_ALLOCATOR(ImporterRootDisplayWidget, AZ::SystemAllocator);
 
     ImporterRootDisplayWidget(AZ::SerializeContext* serializeContext, QWidget* parent = nullptr);
 

Code/Editor/Plugins/ProjectSettingsTool/PlatformSettings_Android.h

@@ -16,7 +16,7 @@ namespace ProjectSettingsTool
     {
     public:
         AZ_TYPE_INFO(AndroidIcons, "{D807ABEA-9C79-4EDD-B418-9A823E812C9A}");
-        AZ_CLASS_ALLOCATOR(AndroidIcons, AZ::SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(AndroidIcons, AZ::SystemAllocator);
 
         AndroidIcons()
             : m_default("")
@@ -41,7 +41,7 @@ namespace ProjectSettingsTool
     {
     public:
         AZ_TYPE_INFO(AndroidLandscapeSplashscreens, "{37888881-5050-47B6-9EB4-A408FD27D397}");
-        AZ_CLASS_ALLOCATOR(AndroidIcons, AZ::SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(AndroidIcons, AZ::SystemAllocator);
 
         AndroidLandscapeSplashscreens()
             : m_default("")
@@ -64,7 +64,7 @@ namespace ProjectSettingsTool
     {
     public:
         AZ_TYPE_INFO(AndroidPortraitSplashscreens, "{2AADA22F-B5A3-440C-A592-FB923BC66878}");
-        AZ_CLASS_ALLOCATOR(AndroidPortraitSplashscreens, AZ::SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(AndroidPortraitSplashscreens, AZ::SystemAllocator);
 
         AndroidPortraitSplashscreens()
             : m_default("")
@@ -87,7 +87,7 @@ namespace ProjectSettingsTool
     {
     public:
         AZ_TYPE_INFO(AndroidSplashscreens, "{95985732-F45B-436A-86BC-7AE5249FF520}");
-        AZ_CLASS_ALLOCATOR(AndroidSplashscreens, AZ::SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(AndroidSplashscreens, AZ::SystemAllocator);
 
         AndroidSplashscreens()
             : m_landscapeSplashscreens()
@@ -104,7 +104,7 @@ namespace ProjectSettingsTool
     {
     public:
         AZ_TYPE_INFO(AndroidSettings, "{5D57D014-4939-4D86-B862-AF35BAC705DC}");
-        AZ_CLASS_ALLOCATOR(AndroidSettings, AZ::SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(AndroidSettings, AZ::SystemAllocator);
 
         AndroidSettings()
             : m_packageName("")

Code/Editor/Plugins/ProjectSettingsTool/PlatformSettings_Base.h

@@ -16,7 +16,7 @@ namespace ProjectSettingsTool
     {
     public:
         AZ_TYPE_INFO(BaseSettings, "{3202E013-46EC-4E97-989A-84934CA15C59}");
-        AZ_CLASS_ALLOCATOR(BaseSettings, AZ::SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(BaseSettings, AZ::SystemAllocator);
 
         BaseSettings()
             : m_projectName("")

Code/Editor/Plugins/ProjectSettingsTool/PlatformSettings_Ios.h

@@ -16,7 +16,7 @@ namespace ProjectSettingsTool
     {
     public:
         AZ_TYPE_INFO(IosIcons, "{A57F9F23-36F5-4425-B40A-56D60119E5C9}");
-        AZ_CLASS_ALLOCATOR(IosIcons, AZ::SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(IosIcons, AZ::SystemAllocator);
 
         IosIcons()
             : m_appStore("")
@@ -65,7 +65,7 @@ namespace ProjectSettingsTool
     {
     public:
         AZ_TYPE_INFO(IosLaunchscreens, "{1A34706F-9558-4081-9898-33758B026629}");
-        AZ_CLASS_ALLOCATOR(IosLaunchscreens, AZ::SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(IosLaunchscreens, AZ::SystemAllocator);
 
         IosLaunchscreens()
             : m_iphone640x960("")
@@ -100,7 +100,7 @@ namespace ProjectSettingsTool
     {
     public:
         AZ_TYPE_INFO(IosOrientations, "{A42CDF2E-CCE1-4D93-9D4E-2270CFC0F2ED}");
-        AZ_CLASS_ALLOCATOR(IosOrientations, AZ::SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(IosOrientations, AZ::SystemAllocator);
 
         IosOrientations()
             : m_landscapeRight(false)
@@ -121,7 +121,7 @@ namespace ProjectSettingsTool
     {
     public:
         AZ_TYPE_INFO(IosSettings, "{9EDF051E-0158-4ADE-92A3-B7AC230E0114}");
-        AZ_CLASS_ALLOCATOR(IosSettings, AZ::SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(IosSettings, AZ::SystemAllocator);
 
         IosSettings()
             : m_bundleName("")

Code/Editor/Plugins/ProjectSettingsTool/PropertyFileSelect.h

@@ -43,7 +43,7 @@ namespace ProjectSettingsTool
     class PropertyFileSelectHandler
         : public AzToolsFramework::PropertyHandler<AZStd::string, PropertyFileSelectCtrl>
     {
-        AZ_CLASS_ALLOCATOR(PropertyFileSelectHandler, AZ::SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(PropertyFileSelectHandler, AZ::SystemAllocator);
 
     public:
         PropertyFileSelectHandler(ValidationHandler* valHdlr);

Code/Editor/Plugins/ProjectSettingsTool/PropertyFuncValBrowseEdit.h

@@ -27,7 +27,7 @@ namespace ProjectSettingsTool
         Q_OBJECT
 
     public:
-        AZ_CLASS_ALLOCATOR(PropertyFuncValBrowseEditCtrl, AZ::SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(PropertyFuncValBrowseEditCtrl, AZ::SystemAllocator);
 
         PropertyFuncValBrowseEditCtrl(QWidget* pParent = nullptr);
 
@@ -65,7 +65,7 @@ namespace ProjectSettingsTool
     class PropertyFuncValBrowseEditHandler
         : public AzToolsFramework::PropertyHandler <AZStd::string, PropertyFuncValBrowseEditCtrl>
     {
-        AZ_CLASS_ALLOCATOR(PropertyFuncValBrowseEditHandler, AZ::SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(PropertyFuncValBrowseEditHandler, AZ::SystemAllocator);
 
     public:
         PropertyFuncValBrowseEditHandler(ValidationHandler* valHdlr);

Code/Editor/Plugins/ProjectSettingsTool/PropertyFuncValLineEdit.h

@@ -57,7 +57,7 @@ namespace ProjectSettingsTool
     class PropertyFuncValLineEditHandler
         : public AzToolsFramework::PropertyHandler <AZStd::string, PropertyFuncValLineEditCtrl>
     {
-        AZ_CLASS_ALLOCATOR(PropertyFuncValLineEditHandler, AZ::SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(PropertyFuncValLineEditHandler, AZ::SystemAllocator);
 
     public:
         PropertyFuncValLineEditHandler(ValidationHandler* valHdlr);

Code/Editor/Plugins/ProjectSettingsTool/PropertyImagePreview.h

@@ -69,7 +69,7 @@ namespace ProjectSettingsTool
     class PropertyImagePreviewHandler
         : public AzToolsFramework::PropertyHandler<AZStd::string, PropertyImagePreviewCtrl>
     {
-        AZ_CLASS_ALLOCATOR(PropertyImagePreviewHandler, AZ::SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(PropertyImagePreviewHandler, AZ::SystemAllocator);
 
     public:
         PropertyImagePreviewHandler(ValidationHandler* valHdlr);

Code/Editor/Plugins/ProjectSettingsTool/PropertyLinked.h

@@ -67,7 +67,7 @@ namespace ProjectSettingsTool
     class PropertyLinkedHandler
         : public AzToolsFramework::PropertyHandler<AZStd::string, PropertyLinkedCtrl>
     {
-        AZ_CLASS_ALLOCATOR(PropertyLinkedHandler, AZ::SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(PropertyLinkedHandler, AZ::SystemAllocator);
 
     public:
         PropertyLinkedHandler(ValidationHandler* valHdlr);

Code/Framework/AtomCore/AtomCore/Instance/InstanceDatabase.h

@@ -158,7 +158,7 @@ namespace AZ
         {
             static_assert(AZStd::is_base_of<InstanceData, Type>::value, "Type must inherit from Data::Instance to be used in Data::InstanceDatabase.");
         public:
-            AZ_CLASS_ALLOCATOR(InstanceDatabase, AZ::SystemAllocator, 0);
+            AZ_CLASS_ALLOCATOR(InstanceDatabase, AZ::SystemAllocator);
 
             /**
              * Create the InstanceDatabase with a single handler.

Code/Framework/AtomCore/Tests/InstanceDatabase.cpp

@@ -33,7 +33,7 @@ namespace UnitTest
     class TestAssetType : public AssetData
     {
     public:
-        AZ_CLASS_ALLOCATOR(TestAssetType, AZ::SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(TestAssetType, AZ::SystemAllocator);
         AZ_RTTI(TestAssetType, "{73D60606-BDE5-44F9-9420-5649FE7BA5B8}", AssetData);
 
         TestAssetType()
@@ -46,7 +46,7 @@ namespace UnitTest
     {
     public:
         AZ_INSTANCE_DATA(TestInstanceA, "{65CBF1C8-F65F-4A84-8A11-B510BC435DB0}");
-        AZ_CLASS_ALLOCATOR(TestInstanceA, AZ::SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(TestInstanceA, AZ::SystemAllocator);
 
         TestInstanceA(TestAssetType* asset)
             : m_asset{ asset, AZ::Data::AssetLoadBehavior::Default }
@@ -60,7 +60,7 @@ namespace UnitTest
     {
     public:
         AZ_INSTANCE_DATA(TestInstanceB, "{4ED0A8BF-7800-44B2-AC73-2CB759C61C37}");
-        AZ_CLASS_ALLOCATOR(TestInstanceB, AZ::SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(TestInstanceB, AZ::SystemAllocator);
 
         TestInstanceB(TestAssetType* asset)
             : m_asset{ asset, AZ::Data::AssetLoadBehavior::Default }
@@ -84,7 +84,7 @@ namespace UnitTest
     class MyAssetHandler : public AssetHandler
     {
     public:
-        AZ_CLASS_ALLOCATOR(MyAssetHandler, AZ::SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(MyAssetHandler, AZ::SystemAllocator);
 
         AssetPtr CreateAsset(const AssetId& id, const AssetType& type) override
         {

Code/Framework/AzCore/AzCore/Asset/AssetCommon.h

@@ -129,7 +129,7 @@ namespace AZ
                 Error,              ///< Asset attempted to load, but it or a strict dependency failed.
             };
 
-            AZ_CLASS_ALLOCATOR(AssetData, SystemAllocator, 0);
+            AZ_CLASS_ALLOCATOR(AssetData, SystemAllocator);
             AZ_RTTI(AssetData, "{AF3F7D32-1536-422A-89F3-A11E1F5B5A9C}");
 
             AssetData(const AssetId& assetId = AssetId(), AssetStatus status = AssetStatus::NotLoaded)
@@ -636,7 +636,7 @@ namespace AZ
             : public AssetBus::Handler
         {
         public:
-            AZ_CLASS_ALLOCATOR(AssetBusCallbacks, AZ::SystemAllocator, 0);
+            AZ_CLASS_ALLOCATOR(AssetBusCallbacks, AZ::SystemAllocator);
 
             using AssetReadyCB = AZStd::function<void (Asset<AssetData> /*asset*/, AssetBusCallbacks& /*callbacks*/)>;
             using AssetMovedCB = AZStd::function<void (Asset<AssetData> /*asset*/, void* /*oldDataPointer*/, AssetBusCallbacks& /*callbacks*/)>;

Code/Framework/AzCore/AzCore/Asset/AssetContainer.h

@@ -32,7 +32,7 @@ namespace AZ
             AZ::Data::AssetLoadBus::MultiHandler
         {
         public:
-            AZ_CLASS_ALLOCATOR(AssetContainer, SystemAllocator, 0);
+            AZ_CLASS_ALLOCATOR(AssetContainer, SystemAllocator);
 
             AssetContainer() = default;
 

Code/Framework/AzCore/AzCore/Asset/AssetJsonSerializer.cpp

@@ -14,7 +14,7 @@
 
 namespace AZ::Data
 {
-    AZ_CLASS_ALLOCATOR_IMPL(AssetJsonSerializer, SystemAllocator, 0);
+    AZ_CLASS_ALLOCATOR_IMPL(AssetJsonSerializer, SystemAllocator);
 
     JsonSerializationResult::Result AssetJsonSerializer::Load(void* outputValue, const Uuid& /*outputValueTypeId*/,
         const rapidjson::Value& inputValue, JsonDeserializerContext& context)

Code/Framework/AzCore/AzCore/Asset/AssetManager.cpp

@@ -123,7 +123,7 @@ namespace AZ::Data
         : public AssetDatabaseAsyncJob
     {
     public:
-        AZ_CLASS_ALLOCATOR(LoadAssetJob, ThreadPoolAllocator, 0);
+        AZ_CLASS_ALLOCATOR(LoadAssetJob, ThreadPoolAllocator);
 
         LoadAssetJob(AssetManager* owner, const Asset<AssetData>& asset,
             AZStd::shared_ptr<AssetDataStream> dataStream, bool isReload, AZ::IO::IStreamerTypes::RequestStatus requestState,
@@ -248,7 +248,7 @@ namespace AZ::Data
         : public BlockingAssetLoadBus::Handler
     {
     public:
-        AZ_CLASS_ALLOCATOR(WaitForAsset, ThreadPoolAllocator, 0);
+        AZ_CLASS_ALLOCATOR(WaitForAsset, ThreadPoolAllocator);
 
 
         WaitForAsset(const Asset<AssetData>& assetToWaitFor, bool shouldDispatchEvents)
@@ -404,7 +404,7 @@ namespace AZ::Data
         : public AssetDatabaseAsyncJob
     {
     public:
-        AZ_CLASS_ALLOCATOR(SaveAssetJob, ThreadPoolAllocator, 0);
+        AZ_CLASS_ALLOCATOR(SaveAssetJob, ThreadPoolAllocator);
 
         SaveAssetJob(JobContext* jobContext, AssetManager* owner, const Asset<AssetData>& asset, AssetHandler* assetHandler)
             : AssetDatabaseAsyncJob(jobContext, true, owner, asset, assetHandler)

Code/Framework/AzCore/AzCore/Asset/AssetManager.h

@@ -156,7 +156,7 @@ namespace AZ
             typedef AZStd::unordered_map<AssetContainerKey, AZStd::weak_ptr<AssetContainer>> WeakAssetContainerMap;
             typedef AZStd::unordered_map<AssetContainer*, AZStd::shared_ptr<AssetContainer>> OwnedAssetContainerMap;
 
-            AZ_CLASS_ALLOCATOR(AssetManager, SystemAllocator, 0);
+            AZ_CLASS_ALLOCATOR(AssetManager, SystemAllocator);
 
             static bool Create(const Descriptor& desc);
             static void Destroy();

Code/Framework/AzCore/AzCore/AzCoreModule.h

@@ -16,7 +16,7 @@ namespace AZ
     {
     public:
         AZ_RTTI(AzCoreModule, "{898CE9C5-B4CC-4331-811E-3B44B967A1C1}", AZ::Module);
-        AZ_CLASS_ALLOCATOR(AzCoreModule, AZ::OSAllocator, 0);
+        AZ_CLASS_ALLOCATOR(AzCoreModule, AZ::OSAllocator);
 
         AzCoreModule();
         ~AzCoreModule() override = default;

Code/Framework/AzCore/AzCore/Component/Component.h

@@ -256,7 +256,7 @@ namespace AZ
      * create a component.
      */
     #define AZ_COMPONENT_BASE(_ComponentClass, ...)                                                                                     \
-    AZ_CLASS_ALLOCATOR(_ComponentClass, AZ::SystemAllocator, 0)                                                                         \
+    AZ_CLASS_ALLOCATOR(_ComponentClass, AZ::SystemAllocator)                                                                            \
     template<class Comp, class Void> friend class AZ::HasComponentReflect;                                                              \
     template<class Comp, class Void> friend class AZ::HasComponentProvidedServices;                                                     \
     template<class Comp, class Void> friend class AZ::HasComponentDependentServices;                                                    \
@@ -523,7 +523,7 @@ namespace AZ
          * Specifies that this class should use the AZ::SystemAllocator for memory
          * management by default.
          */
-        AZ_CLASS_ALLOCATOR(ComponentDescriptorDefault<ComponentClass>, SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(ComponentDescriptorDefault<ComponentClass>, SystemAllocator);
 
         /**
          * Calls the static function AZ::ComponentDescriptor::Reflect if the user provided it.

Code/Framework/AzCore/AzCore/Component/ComponentApplication.h

@@ -89,7 +89,7 @@ namespace AZ
 
     public:
         AZ_RTTI(ComponentApplication, "{1F3B070F-89F7-4C3D-B5A3-8832D5BC81D7}");
-        AZ_CLASS_ALLOCATOR(ComponentApplication, SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(ComponentApplication, SystemAllocator);
 
         /**
          * Configures the component application.
@@ -102,7 +102,7 @@ namespace AZ
             : public SerializeContext::IObjectFactory
         {
             AZ_TYPE_INFO(ComponentApplication::Descriptor, "{70277A3E-2AF5-4309-9BBF-6161AFBDE792}");
-            AZ_CLASS_ALLOCATOR(ComponentApplication::Descriptor, SystemAllocator, 0);
+            AZ_CLASS_ALLOCATOR(ComponentApplication::Descriptor, SystemAllocator);
 
             ///////////////////////////////////////////////
             // SerializeContext::IObjectFactory

Code/Framework/AzCore/AzCore/Component/ComponentBus.h

@@ -86,7 +86,7 @@ namespace AZ
     class ComponentConfig
     {
     public:
-        AZ_CLASS_ALLOCATOR(ComponentConfig, SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(ComponentConfig, SystemAllocator);
         AZ_RTTI(ComponentConfig, "{0A7929DF-2932-40EA-B2B3-79BC1C3490D0}");
 
         virtual ~ComponentConfig() = default;
@@ -104,7 +104,7 @@ namespace AZ
          * Specifies that this class should use AZ::SystemAllocator for memory
          * management by default.
          */
-        AZ_CLASS_ALLOCATOR(EntityComponentIdPair, AZ::SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(EntityComponentIdPair, AZ::SystemAllocator);
 
         /**
          * Adds run-time type information to this class.

Code/Framework/AzCore/AzCore/Component/Entity.h

@@ -36,7 +36,7 @@ namespace AZ
     public:
 
         //! Specifies that this class should use AZ::SystemAllocator for memory management by default.
-        AZ_CLASS_ALLOCATOR(Entity, SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(Entity, SystemAllocator);
 
         //! Adds run-time type information to this class.
         AZ_RTTI(AZ::Entity, "{75651658-8663-478D-9090-2432DFCAFA44}");

Code/Framework/AzCore/AzCore/Component/EntityIdSerializer.cpp

@@ -11,7 +11,7 @@
 
 namespace AZ
 {
-    AZ_CLASS_ALLOCATOR_IMPL(JsonEntityIdSerializer, SystemAllocator, 0);
+    AZ_CLASS_ALLOCATOR_IMPL(JsonEntityIdSerializer, SystemAllocator);
 
     JsonSerializationResult::Result JsonEntityIdSerializer::Load(void* outputValue, [[maybe_unused]] const Uuid& outputValueTypeId,
         const rapidjson::Value& inputValue, JsonDeserializerContext& context)

Code/Framework/AzCore/AzCore/Component/EntitySerializer.cpp

@@ -13,7 +13,7 @@
 
 namespace AZ
 {
-    AZ_CLASS_ALLOCATOR_IMPL(JsonEntitySerializer, AZ::SystemAllocator, 0);
+    AZ_CLASS_ALLOCATOR_IMPL(JsonEntitySerializer, AZ::SystemAllocator);
 
     JsonSerializationResult::Result JsonEntitySerializer::Load(void* outputValue, [[maybe_unused]] const Uuid& outputValueTypeId,
         const rapidjson::Value& inputValue, JsonDeserializerContext& context)

Code/Framework/AzCore/AzCore/Component/EntityUtils.h

@@ -26,7 +26,7 @@ namespace AZ
          */
         struct SerializableEntityContainer
         {
-            AZ_CLASS_ALLOCATOR(SerializableEntityContainer, SystemAllocator, 0);
+            AZ_CLASS_ALLOCATOR(SerializableEntityContainer, SystemAllocator);
             AZ_TYPE_INFO(SerializableEntityContainer, "{E98CF1B5-6B72-46C5-AB87-3DB85FD1B48D}");
 
             AZStd::vector<AZ::Entity*> m_entities;

Code/Framework/AzCore/AzCore/Component/NamedEntityId.h

@@ -21,7 +21,7 @@ namespace AZ
         : public EntityId
     {
     public: 
-        AZ_CLASS_ALLOCATOR(NamedEntityId, AZ::SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(NamedEntityId, AZ::SystemAllocator);
         AZ_RTTI(NamedEntityId, "{27F37921-4B40-4BE6-B47B-7D3AB8682D58}", EntityId);
 
         static void Reflect(AZ::ReflectContext* context);

Code/Framework/AzCore/AzCore/Component/TransformBus.h

@@ -355,7 +355,7 @@ namespace AZ
     {
     public:
         AZ_RTTI(TransformConfig, "{B3AAB26D-D075-4E2B-9653-9527EE363DF8}", ComponentConfig);
-        AZ_CLASS_ALLOCATOR(TransformConfig, SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(TransformConfig, SystemAllocator);
 
         //! Behavior when a parent entity activates.
         //! A parent may activate before or after its children have activated.

Code/Framework/AzCore/AzCore/Console/Console.h

@@ -23,7 +23,7 @@ namespace AZ
     {
     public:
         AZ_RTTI(Console, "{CF6DCDE7-1A66-442C-BA87-01A432C13E7D}", IConsole);
-        AZ_CLASS_ALLOCATOR(Console, AZ::OSAllocator, 0);
+        AZ_CLASS_ALLOCATOR(Console, AZ::OSAllocator);
 
         Console();
         //! Constructor overload which registers a notifier with the Settings Registry that will execute

Code/Framework/AzCore/AzCore/DOM/DomValue.h

@@ -150,7 +150,7 @@ namespace AZ::Dom
     {
     public:
         AZ_TYPE_INFO(Value, "{3E20677F-3B8E-4F89-B665-ED41D74F4799}");
-        AZ_CLASS_ALLOCATOR(Value, ValueAllocator, 0);
+        AZ_CLASS_ALLOCATOR(Value, ValueAllocator);
 
         // Determine the short string buffer size based on the size of our largest internal type (string_view)
         // minus the size of the short string size field.

Code/Framework/AzCore/AzCore/Debug/Budget.cpp

@@ -26,7 +26,7 @@ namespace AZ::Debug
 {
     struct BudgetImpl
     {
-        AZ_CLASS_ALLOCATOR(BudgetImpl, AZ::SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(BudgetImpl, AZ::SystemAllocator);
         // TODO: Budget implementation for tracking budget wall time per-core, memory, etc.
     };
 

Code/Framework/AzCore/AzCore/Debug/TraceReflection.cpp

@@ -26,7 +26,7 @@ namespace AZ::Debug
         , public AZ::TickBus::Handler
     {
     public:
-        AZ_CLASS_ALLOCATOR(TraceMessageBusHandler, AZ::SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(TraceMessageBusHandler, AZ::SystemAllocator);
         AZ_RTTI(TraceMessageBusHandler, "{5CDBAF09-5EB0-48AC-B327-2AF8601BB550}", AZ::BehaviorEBusHandler);
 
         TraceMessageBusHandler();

Code/Framework/AzCore/AzCore/EBus/Environment.h

@@ -90,7 +90,7 @@ namespace AZ
         friend struct EBusEnvironmentStoragePolicy;
 
     public:
-        AZ_CLASS_ALLOCATOR(EBusEnvironment, AZ::OSAllocator, 0);
+        AZ_CLASS_ALLOCATOR(EBusEnvironment, AZ::OSAllocator);
 
         EBusEnvironment();
 

Code/Framework/AzCore/AzCore/EBus/Event.h

@@ -49,7 +49,7 @@ namespace AZ
         using Callback = AZStd::function<void(Params...)>;
         using Handler = EventHandler<Params...>;       
 
-        AZ_CLASS_ALLOCATOR(Event<Params...>, AZ::SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(Event<Params...>, AZ::SystemAllocator);
 
         Event() = default;
         Event(Event&& rhs);
@@ -101,7 +101,7 @@ namespace AZ
     public:
         using Callback = AZStd::function<void(Params...)>;
 
-        AZ_CLASS_ALLOCATOR(EventHandler<Params...>, AZ::SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(EventHandler<Params...>, AZ::SystemAllocator);
 
         // We support default constructing of event handles (with no callback function being bound) to allow for better usage with container types
         // An unbound event handle cannot be added to an event and we do not support dynamically binding the callback post construction

Code/Framework/AzCore/AzCore/IO/CompressorStream.h

@@ -27,7 +27,7 @@ namespace AZ
             : public GenericStream
         {
         public:
-            AZ_CLASS_ALLOCATOR(CompressorStream, SystemAllocator, 0);
+            AZ_CLASS_ALLOCATOR(CompressorStream, SystemAllocator);
             CompressorStream(const char* filename, OpenMode flags = OpenMode());
             CompressorStream(GenericStream* stream, bool ownStream);
             virtual ~CompressorStream();

Code/Framework/AzCore/AzCore/IO/CompressorZLib.h

@@ -45,7 +45,7 @@ namespace AZ
             : public CompressorData
         {
         public:
-            AZ_CLASS_ALLOCATOR(CompressorZLibData, AZ::SystemAllocator, 0);
+            AZ_CLASS_ALLOCATOR(CompressorZLibData, AZ::SystemAllocator);
 
             CompressorZLibData(IAllocator* zlibMemAllocator = 0)
                 : m_zlib(zlibMemAllocator)
@@ -82,7 +82,7 @@ namespace AZ
             : public Compressor
         {
         public:
-            AZ_CLASS_ALLOCATOR(CompressorZLib, AZ::SystemAllocator, 0);
+            AZ_CLASS_ALLOCATOR(CompressorZLib, AZ::SystemAllocator);
 
             /**
              * \param decompressionCachePerStream cache of decompressed data stored per stream, the more streams you have open the more memory it will use,

Code/Framework/AzCore/AzCore/IO/CompressorZStd.h

@@ -46,7 +46,7 @@ namespace AZ
             : public CompressorData
         {
         public:
-            AZ_CLASS_ALLOCATOR(CompressorZStdData, AZ::SystemAllocator, 0);
+            AZ_CLASS_ALLOCATOR(CompressorZStdData, AZ::SystemAllocator);
 
             CompressorZStdData(IAllocator* zstdMemAllocator = 0)
             {
@@ -73,7 +73,7 @@ namespace AZ
             : public Compressor
         {
         public:
-            AZ_CLASS_ALLOCATOR(CompressorZStd, AZ::SystemAllocator, 0);
+            AZ_CLASS_ALLOCATOR(CompressorZStd, AZ::SystemAllocator);
 
             /**
              * \param decompressionCachePerStream cache of decompressed data stored per stream, the more streams you have open the more memory it will use,

Code/Framework/AzCore/AzCore/IO/FileIO.h

@@ -242,7 +242,7 @@ namespace AZ
             : public GenericStream
         {
         public:
-            AZ_CLASS_ALLOCATOR(FileIOStream, SystemAllocator, 0);
+            AZ_CLASS_ALLOCATOR(FileIOStream, SystemAllocator);
             FileIOStream();
             FileIOStream(HandleType fileHandle, AZ::IO::OpenMode mode, bool ownsHandle);
             FileIOStream(const char* path, AZ::IO::OpenMode mode, bool errorOnFailure = false);

Code/Framework/AzCore/AzCore/IO/Streamer/BlockCache.h

@@ -32,7 +32,7 @@ namespace AZ::IO
         public IStreamerStackConfig
     {
         AZ_RTTI(AZ::IO::BlockCacheConfig, "{70120525-88A4-40B6-A75B-BAA7E8FD77F3}", IStreamerStackConfig);
-        AZ_CLASS_ALLOCATOR(BlockCacheConfig, AZ::SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(BlockCacheConfig, AZ::SystemAllocator);
 
         ~BlockCacheConfig() override = default;
         AZStd::shared_ptr<StreamStackEntry> AddStreamStackEntry(

Code/Framework/AzCore/AzCore/IO/Streamer/DedicatedCache.h

@@ -31,7 +31,7 @@ namespace AZ::IO
         public IStreamerStackConfig
     {
         AZ_RTTI(AZ::IO::DedicatedCacheConfig, "{DF0F6029-02B0-464C-9846-524654335BCC}", IStreamerStackConfig);
-        AZ_CLASS_ALLOCATOR(DedicatedCacheConfig, AZ::SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(DedicatedCacheConfig, AZ::SystemAllocator);
 
         ~DedicatedCacheConfig() override = default;
         AZStd::shared_ptr<StreamStackEntry> AddStreamStackEntry(

Code/Framework/AzCore/AzCore/IO/Streamer/FileRequest.h

@@ -281,7 +281,7 @@ namespace AZ::IO
         using CommandVariant = Requests::CommandVariant;
         using OnCompletionCallback = AZStd::function<void(FileRequest& request)>;
 
-        AZ_CLASS_ALLOCATOR(FileRequest, SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(FileRequest, SystemAllocator);
 
         enum class Usage : u8
         {
@@ -410,7 +410,7 @@ namespace AZ::IO
         friend bool operator==(const FileRequestHandle& lhs, const FileRequestPtr& rhs);
 
     public:
-        AZ_CLASS_ALLOCATOR(ExternalFileRequest, SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(ExternalFileRequest, SystemAllocator);
 
         explicit ExternalFileRequest(StreamerContext* owner);
 

Code/Framework/AzCore/AzCore/IO/Streamer/FullFileDecompressor.h

@@ -31,7 +31,7 @@ namespace AZ::IO
         public IStreamerStackConfig
     {
         AZ_RTTI(AZ::IO::FullFileDecompressorConfig, "{C96B7EC1-8C73-4493-A7CB-66F5D550FC3A}", IStreamerStackConfig);
-        AZ_CLASS_ALLOCATOR(FullFileDecompressorConfig, AZ::SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(FullFileDecompressorConfig, AZ::SystemAllocator);
 
         ~FullFileDecompressorConfig() override = default;
         AZStd::shared_ptr<StreamStackEntry> AddStreamStackEntry(

Code/Framework/AzCore/AzCore/IO/Streamer/ReadSplitter.h

@@ -29,7 +29,7 @@ namespace AZ
             public IStreamerStackConfig
         {
             AZ_RTTI(AZ::IO::ReadSplitterConfig, "{EDDD6CE5-D7BC-4FAB-8EBA-68F5C0390B05}", IStreamerStackConfig);
-            AZ_CLASS_ALLOCATOR(ReadSplitterConfig, AZ::SystemAllocator, 0);
+            AZ_CLASS_ALLOCATOR(ReadSplitterConfig, AZ::SystemAllocator);
 
             ~ReadSplitterConfig() override = default;
             AZStd::shared_ptr<StreamStackEntry> AddStreamStackEntry(

Code/Framework/AzCore/AzCore/IO/Streamer/StorageDrive.h

@@ -28,7 +28,7 @@ namespace AZ::IO
         public IStreamerStackConfig
     {
         AZ_RTTI(AZ::IO::StorageDriveConfig, "{3D568902-6C09-4E9E-A4DB-8B561481D298}", IStreamerStackConfig);
-        AZ_CLASS_ALLOCATOR(StorageDriveConfig, AZ::SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(StorageDriveConfig, AZ::SystemAllocator);
 
         ~StorageDriveConfig() override = default;
         AZStd::shared_ptr<StreamStackEntry> AddStreamStackEntry(

Code/Framework/AzCore/AzCore/IO/Streamer/Streamer.h

@@ -37,7 +37,7 @@ namespace AZ::IO
     {
     public:
         AZ_RTTI(Streamer, "{3D880982-6E3F-4913-9947-55E01030D4AA}", IStreamer);
-        AZ_CLASS_ALLOCATOR(Streamer, SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(Streamer, SystemAllocator);
 
         //
         // Streamer commands.

Code/Framework/AzCore/AzCore/IO/Streamer/StreamerConfiguration.h

@@ -47,7 +47,7 @@ namespace AZ::IO
     {
     public:
         AZ_RTTI(AZ::IO::IStreamerStackConfig, "{97266736-E55E-4BF4-9E4A-9D5A9FF4D230}");
-        AZ_CLASS_ALLOCATOR(IStreamerStackConfig, SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(IStreamerStackConfig, SystemAllocator);
 
         virtual ~IStreamerStackConfig() = default;
         virtual AZStd::shared_ptr<StreamStackEntry> AddStreamStackEntry(
@@ -59,7 +59,7 @@ namespace AZ::IO
     {
     public:
         AZ_RTTI(AZ::IO::StreamerConfig, "{B20540CB-A75C-45F9-A891-7ABFD9192E9F}");
-        AZ_CLASS_ALLOCATOR(StreamerConfig, SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(StreamerConfig, SystemAllocator);
 
         ConfigurableStack<AZ::IO::IStreamerStackConfig> m_stackConfig;
         static void Reflect(ReflectContext* context);

Code/Framework/AzCore/AzCore/Jobs/Algorithms.h

@@ -43,7 +43,7 @@ namespace AZ
             : public Job
         {
         public:
-            AZ_CLASS_ALLOCATOR(ParallelForChunkJob, ThreadPoolAllocator, 0)
+            AZ_CLASS_ALLOCATOR(ParallelForChunkJob, ThreadPoolAllocator);
 
             typedef ParallelForChunkJob<Function, Partition> ThisType;
 
@@ -250,7 +250,7 @@ namespace AZ
             : public JobEmpty
         {
         public:
-            AZ_CLASS_ALLOCATOR(ParallelForFinishJob, ThreadPoolAllocator, 0)
+            AZ_CLASS_ALLOCATOR(ParallelForFinishJob, ThreadPoolAllocator);
 
             ParallelForFinishJob(const Function& function, JobContext* jobContext, const Partition& partition, bool isAutoDelete)
                 : JobEmpty(isAutoDelete, jobContext)
@@ -283,7 +283,7 @@ namespace AZ
 
             typedef typename AZStd::iterator_traits<ForwardIterator>::value_type value_type;
 
-            AZ_CLASS_ALLOCATOR(ParallelForEachForwardFinishJobChunkHelper, ThreadPoolAllocator, 0)
+            AZ_CLASS_ALLOCATOR(ParallelForEachForwardFinishJobChunkHelper, ThreadPoolAllocator);
 
             ParallelForEachForwardFinishJobChunkHelper(ForwardIterator start, ForwardIterator end, const Function& function, const Partition& partition, JobContext* jobContext, bool isAutoDelete)
                 : Job(isAutoDelete, jobContext)
@@ -334,7 +334,7 @@ namespace AZ
             : public JobEmpty
         {
         public:
-            AZ_CLASS_ALLOCATOR(ParallelForEachForwardFinishJob, ThreadPoolAllocator, 0)
+            AZ_CLASS_ALLOCATOR(ParallelForEachForwardFinishJob, ThreadPoolAllocator);
 
             typedef ParallelForEachForwardFinishJobChunkHelper<ForwardIterator, Function, Partition> ChunkHelperJob;
 
@@ -389,7 +389,7 @@ namespace AZ
             : public JobEmpty
         {
         public:
-            AZ_CLASS_ALLOCATOR(ParallelForEachRandomFinishJob, ThreadPoolAllocator, 0)
+            AZ_CLASS_ALLOCATOR(ParallelForEachRandomFinishJob, ThreadPoolAllocator);
 
             typedef typename AZStd::iterator_traits<RandomIterator>::value_type value_type;
 

Code/Framework/AzCore/AzCore/Jobs/Internal/JobManagerWorkStealing.h

@@ -86,7 +86,7 @@ namespace AZ
 
             struct ThreadInfo
             {
-                AZ_CLASS_ALLOCATOR(ThreadInfo, ThreadPoolAllocator, 0)
+                AZ_CLASS_ALLOCATOR(ThreadInfo, ThreadPoolAllocator);
 
                 AZStd::thread::id m_threadId;
                 bool m_isWorker = false;

Code/Framework/AzCore/AzCore/Jobs/Internal/JobNotify.h

@@ -23,7 +23,7 @@ namespace AZ
             : public Job
         {
         public:
-            AZ_CLASS_ALLOCATOR(JobNotify, ThreadPoolAllocator, 0)
+            AZ_CLASS_ALLOCATOR(JobNotify, ThreadPoolAllocator);
 
             JobNotify(AZStd::atomic<bool>* notifyFlag, JobContext* context = nullptr)
                 : Job(false, context)

Code/Framework/AzCore/AzCore/Jobs/JobCancelGroup.h

@@ -30,7 +30,7 @@ namespace AZ
     class JobCancelGroup
     {
     public:
-        AZ_CLASS_ALLOCATOR(JobCancelGroup, ThreadPoolAllocator, 0)
+        AZ_CLASS_ALLOCATOR(JobCancelGroup, ThreadPoolAllocator);
 
         /**
          * Creates a group with no parent.

Code/Framework/AzCore/AzCore/Jobs/JobCompletion.h

@@ -21,7 +21,7 @@ namespace AZ
         : public Job
     {
     public:
-        AZ_CLASS_ALLOCATOR(JobCompletion, ThreadPoolAllocator, 0)
+        AZ_CLASS_ALLOCATOR(JobCompletion, ThreadPoolAllocator);
 
         JobCompletion(JobContext* context = nullptr)
             : Job(false, context, true)

Code/Framework/AzCore/AzCore/Jobs/JobCompletionSpin.h

@@ -26,7 +26,7 @@ namespace AZ
         : public Job
     {
     public:
-        AZ_CLASS_ALLOCATOR(JobCompletionSpin, ThreadPoolAllocator, 0)
+        AZ_CLASS_ALLOCATOR(JobCompletionSpin, ThreadPoolAllocator);
 
         JobCompletionSpin(JobContext* context = nullptr)
             : Job(false, context, true)

Code/Framework/AzCore/AzCore/Jobs/JobContext.h

@@ -21,7 +21,7 @@ namespace AZ
     class JobContext
     {
     public:
-        AZ_CLASS_ALLOCATOR(JobContext, ThreadPoolAllocator, 0)
+        AZ_CLASS_ALLOCATOR(JobContext, ThreadPoolAllocator);
 
         JobContext(JobManager& jobManager)
             : m_jobManager(jobManager)

Code/Framework/AzCore/AzCore/Jobs/JobEmpty.h

@@ -20,7 +20,7 @@ namespace AZ
         : public Job
     {
     public:
-        AZ_CLASS_ALLOCATOR(JobEmpty, ThreadPoolAllocator, 0)
+        AZ_CLASS_ALLOCATOR(JobEmpty, ThreadPoolAllocator);
 
         JobEmpty(bool isAutoDelete, JobContext* context = nullptr)
             : Job(isAutoDelete, context)

Code/Framework/AzCore/AzCore/Jobs/JobFunction.h

@@ -25,7 +25,7 @@ namespace AZ
         : public Job
     {
     public:
-        AZ_CLASS_ALLOCATOR(JobFunction, ThreadPoolAllocator, 0)
+        AZ_CLASS_ALLOCATOR(JobFunction, ThreadPoolAllocator);
 
         typedef const typename AZStd::remove_cv<typename AZStd::remove_reference<Function>::type>::type& FunctionCRef;
 

Code/Framework/AzCore/AzCore/Jobs/JobManager.cpp

@@ -12,7 +12,7 @@
 
 using namespace AZ;
 
-AZ_CLASS_ALLOCATOR_IMPL(JobManager, SystemAllocator, 0)
+AZ_CLASS_ALLOCATOR_IMPL(JobManager, SystemAllocator);
 
 JobManager::JobManager(const JobManagerDesc& desc)
     : m_impl(desc)

Code/Framework/AzCore/AzCore/Jobs/MultipleDependentJob.h

@@ -22,7 +22,7 @@ namespace AZ
         : public Job
     {
     public:
-        AZ_CLASS_ALLOCATOR(MultipleDependentJob, ThreadPoolAllocator, 0)
+        AZ_CLASS_ALLOCATOR(MultipleDependentJob, ThreadPoolAllocator);
 
         MultipleDependentJob(bool isAutoDelete, JobContext* context = NULL)
             : Job(isAutoDelete, context)  { }

Code/Framework/AzCore/AzCore/Jobs/task_group.h

@@ -21,7 +21,7 @@ namespace AZ
     class structured_task_group
     {
     public:
-        AZ_CLASS_ALLOCATOR(structured_task_group, ThreadPoolAllocator, 0)
+        AZ_CLASS_ALLOCATOR(structured_task_group, ThreadPoolAllocator);
 
         /**
          * This default constructor obtains the parent JobContext from the global context. The parent context can

Code/Framework/AzCore/AzCore/Math/ColorSerializer.cpp

@@ -17,7 +17,7 @@
 
 namespace AZ
 {
-    AZ_CLASS_ALLOCATOR_IMPL(JsonColorSerializer, SystemAllocator, 0);
+    AZ_CLASS_ALLOCATOR_IMPL(JsonColorSerializer, SystemAllocator);
 
     JsonSerializationResult::Result JsonColorSerializer::Load(void* outputValue, const Uuid& outputValueTypeId,
         const rapidjson::Value& inputValue, JsonDeserializerContext& context)

Code/Framework/AzCore/AzCore/Math/MathMatrixSerializer.cpp

@@ -342,7 +342,7 @@ namespace AZ
 {
     // BaseJsonMatrixSerializer
 
-    AZ_CLASS_ALLOCATOR_IMPL(BaseJsonMatrixSerializer, SystemAllocator, 0);
+    AZ_CLASS_ALLOCATOR_IMPL(BaseJsonMatrixSerializer, SystemAllocator);
 
     auto BaseJsonMatrixSerializer::GetOperationsFlags() const -> OperationFlags
     {
@@ -352,7 +352,7 @@ namespace AZ
 
     // Matrix3x3
 
-    AZ_CLASS_ALLOCATOR_IMPL(JsonMatrix3x3Serializer, SystemAllocator, 0);
+    AZ_CLASS_ALLOCATOR_IMPL(JsonMatrix3x3Serializer, SystemAllocator);
 
     JsonSerializationResult::Result JsonMatrix3x3Serializer::Load(void* outputValue, const Uuid& outputValueTypeId,
         const rapidjson::Value& inputValue, JsonDeserializerContext& context)
@@ -373,7 +373,7 @@ namespace AZ
 
     // Matrix3x4
 
-    AZ_CLASS_ALLOCATOR_IMPL(JsonMatrix3x4Serializer, SystemAllocator, 0);
+    AZ_CLASS_ALLOCATOR_IMPL(JsonMatrix3x4Serializer, SystemAllocator);
 
     JsonSerializationResult::Result JsonMatrix3x4Serializer::Load(void* outputValue, const Uuid& outputValueTypeId,
         const rapidjson::Value& inputValue, JsonDeserializerContext& context)
@@ -393,7 +393,7 @@ namespace AZ
 
     // Matrix4x4
 
-    AZ_CLASS_ALLOCATOR_IMPL(JsonMatrix4x4Serializer, SystemAllocator, 0);
+    AZ_CLASS_ALLOCATOR_IMPL(JsonMatrix4x4Serializer, SystemAllocator);
 
     JsonSerializationResult::Result JsonMatrix4x4Serializer::Load(void* outputValue, const Uuid& outputValueTypeId,
         const rapidjson::Value& inputValue, JsonDeserializerContext& context)

Code/Framework/AzCore/AzCore/Math/MathReflection.cpp

@@ -232,7 +232,7 @@ namespace AZ
     {
     public:
         AZ_TYPE_INFO(MathGlobals, "{35D44724-7470-42F2-A0E3-4E4349793B98}");
-        AZ_CLASS_ALLOCATOR(MathGlobals, SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(MathGlobals, SystemAllocator);
 
         MathGlobals() = default;
         ~MathGlobals() = default;

Code/Framework/AzCore/AzCore/Math/MathVectorSerializer.cpp

@@ -198,7 +198,7 @@ namespace AZ
 
     // BaseJsonVectorSerializer
 
-    AZ_CLASS_ALLOCATOR_IMPL(BaseJsonVectorSerializer, SystemAllocator, 0);
+    AZ_CLASS_ALLOCATOR_IMPL(BaseJsonVectorSerializer, SystemAllocator);
 
     auto BaseJsonVectorSerializer::GetOperationsFlags() const -> OperationFlags
     {
@@ -208,7 +208,7 @@ namespace AZ
     
     // Vector2
 
-    AZ_CLASS_ALLOCATOR_IMPL(JsonVector2Serializer, SystemAllocator, 0);
+    AZ_CLASS_ALLOCATOR_IMPL(JsonVector2Serializer, SystemAllocator);
 
     JsonSerializationResult::Result JsonVector2Serializer::Load(void* outputValue, const Uuid& outputValueTypeId,
         const rapidjson::Value& inputValue, JsonDeserializerContext& context)
@@ -226,7 +226,7 @@ namespace AZ
 
     // Vector3
 
-    AZ_CLASS_ALLOCATOR_IMPL(JsonVector3Serializer, SystemAllocator, 0);
+    AZ_CLASS_ALLOCATOR_IMPL(JsonVector3Serializer, SystemAllocator);
 
     JsonSerializationResult::Result JsonVector3Serializer::Load(void* outputValue, const Uuid& outputValueTypeId,
         const rapidjson::Value& inputValue, JsonDeserializerContext& context)
@@ -244,7 +244,7 @@ namespace AZ
 
     // Vector4
 
-    AZ_CLASS_ALLOCATOR_IMPL(JsonVector4Serializer, SystemAllocator, 0);
+    AZ_CLASS_ALLOCATOR_IMPL(JsonVector4Serializer, SystemAllocator);
 
     JsonSerializationResult::Result JsonVector4Serializer::Load(void* outputValue, const Uuid& outputValueTypeId,
         const rapidjson::Value& inputValue, JsonDeserializerContext& context)
@@ -261,7 +261,7 @@ namespace AZ
 
     // Quaternion
 
-    AZ_CLASS_ALLOCATOR_IMPL(JsonQuaternionSerializer, SystemAllocator, 0);
+    AZ_CLASS_ALLOCATOR_IMPL(JsonQuaternionSerializer, SystemAllocator);
 
     JsonSerializationResult::Result JsonQuaternionSerializer::Load(void* outputValue, const Uuid& outputValueTypeId,
         const rapidjson::Value& inputValue, JsonDeserializerContext& context)

Code/Framework/AzCore/AzCore/Math/PolygonPrism.cpp

@@ -126,5 +126,5 @@ namespace AZ
         m_onChangeNonUniformScaleCallback = onChangeNonUniformScale;
     }
 
-    AZ_CLASS_ALLOCATOR_IMPL(PolygonPrism, SystemAllocator, 0)
+    AZ_CLASS_ALLOCATOR_IMPL(PolygonPrism, SystemAllocator);
 }

Code/Framework/AzCore/AzCore/Math/Spline.cpp

@@ -1557,9 +1557,9 @@ namespace AZ
         }
     }
 
-    AZ_CLASS_ALLOCATOR_IMPL(Spline, SystemAllocator, 0)
-    AZ_CLASS_ALLOCATOR_IMPL(LinearSpline, SystemAllocator, 0)
-    AZ_CLASS_ALLOCATOR_IMPL(BezierSpline, SystemAllocator, 0)
-    AZ_CLASS_ALLOCATOR_IMPL(BezierSpline::BezierData, SystemAllocator, 0)
-    AZ_CLASS_ALLOCATOR_IMPL(CatmullRomSpline, SystemAllocator, 0)
+    AZ_CLASS_ALLOCATOR_IMPL(Spline, SystemAllocator);
+    AZ_CLASS_ALLOCATOR_IMPL(LinearSpline, SystemAllocator);
+    AZ_CLASS_ALLOCATOR_IMPL(BezierSpline, SystemAllocator);
+    AZ_CLASS_ALLOCATOR_IMPL(BezierSpline::BezierData, SystemAllocator);
+    AZ_CLASS_ALLOCATOR_IMPL(CatmullRomSpline, SystemAllocator);
 }

Code/Framework/AzCore/AzCore/Math/TransformSerializer.cpp

@@ -11,7 +11,7 @@
 
 namespace AZ
 {
-    AZ_CLASS_ALLOCATOR_IMPL(JsonTransformSerializer, AZ::SystemAllocator, 0);
+    AZ_CLASS_ALLOCATOR_IMPL(JsonTransformSerializer, AZ::SystemAllocator);
 
     JsonSerializationResult::Result JsonTransformSerializer::Load(
         void* outputValue, [[maybe_unused]] const Uuid& outputValueTypeId, const rapidjson::Value& inputValue,

Code/Framework/AzCore/AzCore/Math/UuidSerializer.cpp

@@ -15,7 +15,7 @@
 
 namespace AZ
 {
-    AZ_CLASS_ALLOCATOR_IMPL(JsonUuidSerializer, SystemAllocator, 0);
+    AZ_CLASS_ALLOCATOR_IMPL(JsonUuidSerializer, SystemAllocator);
 
     JsonUuidSerializer::MessageResult::MessageResult(AZStd::string_view message, JsonSerializationResult::ResultCode result)
         : m_message(message)

Code/Framework/AzCore/AzCore/Math/VertexContainer.cpp

@@ -20,6 +20,6 @@ namespace AZ
         VertexContainer<Vector3>::Reflect(context);
     }
 
-    AZ_CLASS_ALLOCATOR_IMPL_TEMPLATE(VertexContainer<Vector2>, AZ::SystemAllocator, 0)
-    AZ_CLASS_ALLOCATOR_IMPL_TEMPLATE(VertexContainer<Vector3>, AZ::SystemAllocator, 0)
+    AZ_CLASS_ALLOCATOR_IMPL_TEMPLATE(VertexContainer<Vector2>, AZ::SystemAllocator);
+    AZ_CLASS_ALLOCATOR_IMPL_TEMPLATE(VertexContainer<Vector3>, AZ::SystemAllocator);
 }

Code/Framework/AzCore/AzCore/Memory/PoolAllocator.cpp

@@ -96,7 +96,7 @@ namespace AZ
     class PoolAllocation
     {
     public:
-        AZ_CLASS_ALLOCATOR(PoolAllocation<Allocator>, SystemAllocator, 0)
+        AZ_CLASS_ALLOCATOR(PoolAllocation<Allocator>, SystemAllocator);
 
         using PageType = typename Allocator::Page;
         using BucketType = typename Allocator::Bucket;

Code/Framework/AzCore/AzCore/Memory/PoolAllocator.h

@@ -186,7 +186,7 @@ namespace AZ
         : public Internal::PoolAllocatorHelper<PoolSchema>
     {
     public:
-        AZ_CLASS_ALLOCATOR(PoolAllocator, SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(PoolAllocator, SystemAllocator);
 
         using Base = Internal::PoolAllocatorHelper<PoolSchema>;
 
@@ -206,7 +206,7 @@ namespace AZ
         : public ThreadPoolBase<ThreadPoolAllocator>
     {
     public:
-        AZ_CLASS_ALLOCATOR(ThreadPoolAllocator, SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(ThreadPoolAllocator, SystemAllocator);
 
         using Base = ThreadPoolBase<ThreadPoolAllocator>;
 

Code/Framework/AzCore/AzCore/Metrics/EventLoggerFactoryImpl.h

@@ -21,7 +21,7 @@ namespace AZ::Metrics
     {
     public:
         AZ_RTTI(EventLoggerFactoryImpl, "{7F44BCD5-D4B9-464C-A54C-ECDF3C2E3802}", IEventLoggerFactory);
-        AZ_CLASS_ALLOCATOR(EventLoggerFactoryImpl, AZ::SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(EventLoggerFactoryImpl, AZ::SystemAllocator);
 
         EventLoggerFactoryImpl();
         ~EventLoggerFactoryImpl();

Code/Framework/AzCore/AzCore/Module/Module.h

@@ -33,7 +33,7 @@ namespace AZ
     {
     public:
         AZ_RTTI(Module, "{59682E0E-731F-4361-BC0B-039BC5376CA1}");
-        AZ_CLASS_ALLOCATOR(Module, AZ::SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(Module, AZ::SystemAllocator);
 
         /**
          * Override to register the module's ComponentDescriptors.

Code/Framework/AzCore/AzCore/Module/ModuleManager.h

@@ -41,7 +41,7 @@ namespace AZ
     {
         friend class ModuleManager;
     public:
-        AZ_CLASS_ALLOCATOR(ModuleEntity, SystemAllocator, 0)
+        AZ_CLASS_ALLOCATOR(ModuleEntity, SystemAllocator);
         AZ_RTTI(ModuleEntity, "{C5950488-35E0-4B55-B664-29A691A6482F}", Entity);
 
         static void Reflect(ReflectContext* context);
@@ -67,7 +67,7 @@ namespace AZ
     struct ModuleDataImpl
         : public ModuleData
     {
-        AZ_CLASS_ALLOCATOR(ModuleDataImpl, SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(ModuleDataImpl, SystemAllocator);
 
         ModuleDataImpl() = default;
         ~ModuleDataImpl() override;
@@ -108,7 +108,7 @@ namespace AZ
         , protected EntityBus::Handler
     {
     public:
-        AZ_CLASS_ALLOCATOR(ModuleManager, AZ::OSAllocator, 0);
+        AZ_CLASS_ALLOCATOR(ModuleManager, AZ::OSAllocator);
         static void Reflect(ReflectContext* context);
 
         ModuleManager();

Code/Framework/AzCore/AzCore/Name/Internal/NameData.h

@@ -26,7 +26,7 @@ namespace AZ
             friend NameDictionary;
             friend Name;
         public:
-            AZ_CLASS_ALLOCATOR(NameData, AZ::SystemAllocator, 0);
+            AZ_CLASS_ALLOCATOR(NameData, AZ::SystemAllocator);
 
             using Hash = uint32_t; // We use a 32 bit hash especially for efficient transport over a network.
 

Code/Framework/AzCore/AzCore/Name/Name.h

@@ -82,7 +82,7 @@ namespace AZ
         using Hash = Internal::NameData::Hash;
 
         AZ_TYPE_INFO(Name, "{3D2B920C-9EFD-40D5-AAE0-DF131C3D4931}");
-        AZ_CLASS_ALLOCATOR(Name, AZ::SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(Name, AZ::SystemAllocator);
         static void Reflect(AZ::ReflectContext* context);
 
         Name();

Code/Framework/AzCore/AzCore/Name/NameDictionary.h

@@ -46,7 +46,7 @@ namespace AZ
     class NameDictionary final
     {
     public:
-        AZ_CLASS_ALLOCATOR(NameDictionary, AZ::OSAllocator, 0);
+        AZ_CLASS_ALLOCATOR(NameDictionary, AZ::OSAllocator);
     private:
 
         friend Module;

Code/Framework/AzCore/AzCore/Name/NameJsonSerializer.cpp

@@ -12,7 +12,7 @@
 
 namespace AZ
 {
-    AZ_CLASS_ALLOCATOR_IMPL(NameJsonSerializer, SystemAllocator, 0);
+    AZ_CLASS_ALLOCATOR_IMPL(NameJsonSerializer, SystemAllocator);
 
     JsonSerializationResult::Result NameJsonSerializer::Load(void* outputValue, const Uuid& outputValueTypeId,
         const rapidjson::Value& inputValue, JsonDeserializerContext& context)

Code/Framework/AzCore/AzCore/NativeUI/NativeUISystemComponent.h

@@ -18,7 +18,7 @@ namespace AZ::NativeUI
     {
     public:
         AZ_RTTI(NativeUISystem, "{FF534B2C-11BE-4DEA-A5B7-A4FA96FE1EDE}", NativeUIRequests);
-        AZ_CLASS_ALLOCATOR(NativeUISystem, AZ::OSAllocator, 0);
+        AZ_CLASS_ALLOCATOR(NativeUISystem, AZ::OSAllocator);
 
         NativeUISystem();
         ~NativeUISystem() override;

Code/Framework/AzCore/AzCore/RTTI/AttributeReader.h

@@ -166,7 +166,7 @@ namespace AZ
     class AttributeInvoker
     {
     public:
-        AZ_CLASS_ALLOCATOR(AttributeInvoker, AZ::SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(AttributeInvoker, AZ::SystemAllocator);
 
         // this is the only thing you should need to call!
         // returns false if it is an incompatible type or fails to read it.
@@ -234,7 +234,7 @@ namespace AZ
         : public AttributeInvoker<void*>
     {
     public:
-        AZ_CLASS_ALLOCATOR(AttributeReader, AZ::SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(AttributeReader, AZ::SystemAllocator);
 
         // Bring in AttributeInvoker<void*> constructors into scope
         using AttributeInvoker<void*>::AttributeInvoker;

Code/Framework/AzCore/AzCore/RTTI/BehaviorContext.h

@@ -223,7 +223,7 @@ namespace AZ
         : public AZStd::intrusive_base
     {
     public:
-        AZ_CLASS_ALLOCATOR(BehaviorDefaultValue, AZ::SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(BehaviorDefaultValue, AZ::SystemAllocator);
 
         BehaviorDefaultValue(const BehaviorDefaultValue&) = delete;
         BehaviorDefaultValue(BehaviorDefaultValue&&) = delete;
@@ -379,7 +379,7 @@ namespace AZ
     struct InputRestriction
     {
         AZ_TYPE_INFO(InputRestriction, "{9DF4DDBE-63BE-4749-9921-52C82BF5E307}");
-        AZ_CLASS_ALLOCATOR(InputRestriction, AZ::SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(InputRestriction, AZ::SystemAllocator);
 
         bool m_listExcludes = true;
         InputIndices m_indices;
@@ -394,7 +394,7 @@ namespace AZ
     struct BranchOnResultInfo
     {
         AZ_TYPE_INFO(BranchOnResultInfo, "{C063AB6F-462F-485F-A911-DE3A8946A019}");
-        AZ_CLASS_ALLOCATOR(BranchOnResultInfo, AZ::SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(BranchOnResultInfo, AZ::SystemAllocator);
 
         AZStd::string m_trueName = "True";
         AZStd::string m_falseName = "False";
@@ -409,7 +409,7 @@ namespace AZ
     struct CheckedOperationInfo
     {
         AZ_TYPE_INFO(CheckedOperationInfo, "{9CE9560F-ECAB-46EF-B341-3A86973E71CD}");
-        AZ_CLASS_ALLOCATOR(CheckedOperationInfo, AZ::SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(CheckedOperationInfo, AZ::SystemAllocator);
 
         AZStd::string m_safetyCheckName;
         InputRestriction m_inputRestriction;
@@ -434,7 +434,7 @@ namespace AZ
     struct OverloadArgumentGroupInfo
     {
         AZ_TYPE_INFO(OverloadArgumentGroupInfo, "{AEFEFC42-3ED8-43A9-AE1F-6D8F32A280D2}");
-        AZ_CLASS_ALLOCATOR(OverloadArgumentGroupInfo, AZ::SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(OverloadArgumentGroupInfo, AZ::SystemAllocator);
 
         AZStd::vector<AZStd::string> m_parameterGroupNames;
         AZStd::vector<AZStd::string> m_resultGroupNames;
@@ -447,7 +447,7 @@ namespace AZ
     struct ExplicitOverloadInfo
     {
         AZ_TYPE_INFO(ExplicitOverloadInfo, "{AEFEFC42-3ED8-43A9-AE1F-6D8F32A280D2}");
-        AZ_CLASS_ALLOCATOR(ExplicitOverloadInfo, AZ::SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(ExplicitOverloadInfo, AZ::SystemAllocator);
 
         AZStd::string m_name;
         AZStd::string m_categoryPath;
@@ -503,7 +503,7 @@ namespace AZ
     struct EventHandlerCreationFunctionHolder
     {
         AZ_TYPE_INFO(EventHandlerCreationFunctionHolder, "{40F7C5D8-8DA0-4979-BC8C-0A52EDA80633}");
-        AZ_CLASS_ALLOCATOR(EventHandlerCreationFunctionHolder, AZ::SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(EventHandlerCreationFunctionHolder, AZ::SystemAllocator);
 
         EventHandlerCreationFunction m_function;
     };
@@ -573,7 +573,7 @@ namespace AZ
             using FunctionPointer = R(*)(Args...);
             using ClassType = void;
 
-            AZ_CLASS_ALLOCATOR(BehaviorMethodImpl, AZ::SystemAllocator, 0);
+            AZ_CLASS_ALLOCATOR(BehaviorMethodImpl, AZ::SystemAllocator);
 
             static const int s_startArgumentIndex = 1; // +1 for result type
             static const int s_startNamedArgumentIndex = s_startArgumentIndex; // +1 for result type
@@ -632,7 +632,7 @@ namespace AZ
             using FunctionPointerConst = R(C::*)(Args...) const;
             typedef C ClassType;
 
-            AZ_CLASS_ALLOCATOR(BehaviorMethodImpl<R(C::*)(Args...)>, AZ::SystemAllocator, 0);
+            AZ_CLASS_ALLOCATOR(BehaviorMethodImpl<R(C::*)(Args...)>, AZ::SystemAllocator);
 
             static const int s_startArgumentIndex = 1; // +1 for result type
             static const int s_startNamedArgumentIndex = s_startArgumentIndex + 1; // +1 for result type, +1 for class Type (this ptr)
@@ -791,7 +791,7 @@ namespace AZ
             static const int s_startNamedArgumentIndex =
                 s_startArgumentIndex + s_isBusIdParameter; // +1 for result type, +1 (optional for busID)
 
-            AZ_CLASS_ALLOCATOR(BehaviorEBusEvent, AZ::SystemAllocator, 0);
+            AZ_CLASS_ALLOCATOR(BehaviorEBusEvent, AZ::SystemAllocator);
 
             BehaviorEBusEvent(FunctionPointer functionPointer, BehaviorContext* context);
 
@@ -849,7 +849,7 @@ namespace AZ
             static const int s_startArgumentIndex = 1; // +1 for result type
             static const int s_startNamedArgumentIndex = s_startArgumentIndex + s_isBusIdParameter; // +1 for result type, +1 (optional for busID)
 
-            AZ_CLASS_ALLOCATOR(BehaviorEBusEvent, AZ::SystemAllocator, 0);
+            AZ_CLASS_ALLOCATOR(BehaviorEBusEvent, AZ::SystemAllocator);
 
             BehaviorEBusEvent(FunctionPointer functionPointer, BehaviorContext* context);
             BehaviorEBusEvent(FunctionPointerConst functionPointer, BehaviorContext* context);
@@ -995,7 +995,7 @@ namespace AZ
         class BehaviorValuesSpecialization : public BehaviorValues
         {
         public:
-            AZ_CLASS_ALLOCATOR(BehaviorValuesSpecialization, AZ::SystemAllocator, 0);
+            AZ_CLASS_ALLOCATOR(BehaviorValuesSpecialization, AZ::SystemAllocator);
 
             template<class LastValue>
             inline void SetValues(LastValue&& value)
@@ -1127,7 +1127,7 @@ namespace AZ
     class BehaviorClass
     {
     public:
-        AZ_CLASS_ALLOCATOR(BehaviorClass, SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(BehaviorClass, SystemAllocator);
 
         BehaviorClass();
         ~BehaviorClass();
@@ -1274,7 +1274,7 @@ namespace AZ
         bool SetSetter(Setter setter, BehaviorClass* currentClass, BehaviorContext* context, const AZStd::false_type& /* is AZStd::is_same<Getter,nullptr_t>::type( */);
 
     public:
-        AZ_CLASS_ALLOCATOR(BehaviorProperty, AZ::SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(BehaviorProperty, AZ::SystemAllocator);
 
         BehaviorProperty(BehaviorContext* context);
         ~BehaviorProperty() override;
@@ -1338,7 +1338,7 @@ namespace AZ
     class BehaviorEBus
     {
     public:
-        AZ_CLASS_ALLOCATOR(BehaviorEBus, SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(BehaviorEBus, SystemAllocator);
 
         typedef void(*QueueFunctionType)(void* /*userData1*/, void* /*userData2*/);
 
@@ -1740,7 +1740,7 @@ namespace AZ
         };
 
     public:
-        AZ_CLASS_ALLOCATOR(BehaviorContext, SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(BehaviorContext, SystemAllocator);
         AZ_RTTI(BehaviorContext, "{ED75FE05-9196-4F69-A3E5-1BDF5FF034CF}", ReflectContext);
 
         bool IsTypeReflected(AZ::Uuid typeId) const override;

Code/Framework/AzCore/AzCore/RTTI/BehaviorInterfaceProxy.h

@@ -58,7 +58,7 @@ namespace AZ
     class BehaviorInterfaceProxy
     {
     public:
-        AZ_CLASS_ALLOCATOR(BehaviorInterfaceProxy, AZ::SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(BehaviorInterfaceProxy, AZ::SystemAllocator);
         AZ_RTTI(BehaviorInterfaceProxy<T>, "{E7CC8D27-4499-454E-A7DF-3F72FBECD30D}");
 
         BehaviorInterfaceProxy() = default;

Code/Framework/AzCore/AzCore/RTTI/ReflectContext.h

@@ -318,7 +318,7 @@ namespace AZ
     {
     public:
         AZ_RTTI((AttributeData<T>, "{24248937-86FB-406C-8DD5-023B10BD0B60}", T), Attribute);
-        AZ_CLASS_ALLOCATOR(AttributeData<T>, SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(AttributeData<T>, SystemAllocator);
         template<class U>
         explicit AttributeData(U&& data)
             : m_data(AZStd::forward<U>(data)) {}
@@ -357,7 +357,7 @@ namespace AZ
     {
     public:
         AZ_RTTI((AZ::AttributeMemberData<T C::*>, "{00E5F991-6B96-43CC-9869-F371548581D9}", T, C), AttributeData<T>);
-        AZ_CLASS_ALLOCATOR(AttributeMemberData<T C::*>, SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(AttributeMemberData<T C::*>, SystemAllocator);
         typedef T C::* DataPtr;
         explicit AttributeMemberData(DataPtr p)
             : AttributeData<T>(T())
@@ -485,7 +485,7 @@ namespace AZ
     {
     public:
         AZ_RTTI((AZ::AttributeFunction<R(Args...)>, "{EE535A42-940C-42DE-848D-9C6CE57D8A62}", R, Args...), Attribute);
-        AZ_CLASS_ALLOCATOR(AttributeFunction<R(Args...)>, SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(AttributeFunction<R(Args...)>, SystemAllocator);
         typedef R(*FunctionPtr)(Args...);
         explicit AttributeFunction(FunctionPtr f)
                 : m_function(f)
@@ -535,7 +535,7 @@ namespace AZ
             AZStd::remove_cvref_t<Invocable>>;
     public:
         AZ_RTTI((AttributeInvocable<Invocable>, "{60D5804F-9AF4-4EB1-8F5A-62AFB4883F9D}", Invocable), AZ::Attribute);
-        AZ_CLASS_ALLOCATOR(AttributeInvocable<Invocable>, SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(AttributeInvocable<Invocable>, SystemAllocator);
         template<typename CallableType>
         explicit AttributeInvocable(CallableType&& invocable)
             : m_callable(AZStd::forward<CallableType>(invocable))
@@ -623,7 +623,7 @@ namespace AZ
     {
     public:
         AZ_RTTI((AZ::AttributeMemberFunction<R(C::*)(Args...)>, "{F41F655D-87F7-4A87-9412-9AF4B528B142}", R, C, Args...), AttributeFunction<R(Args...)>);
-        AZ_CLASS_ALLOCATOR(AttributeMemberFunction<R(C::*)(Args...)>, SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(AttributeMemberFunction<R(C::*)(Args...)>, SystemAllocator);
         typedef R(C::* FunctionPtr)(Args...);
 
         explicit AttributeMemberFunction(FunctionPtr f)
@@ -674,7 +674,7 @@ namespace AZ
     {
     public:
         AZ_RTTI((AZ::AttributeMemberFunction<R(C::*)(Args...) const>, "{4E21155A-0FB0-4F11-999A-B946B5954A0A}", R, C, Args...), AttributeFunction<R(Args...)>);
-        AZ_CLASS_ALLOCATOR(AttributeMemberFunction<R(C::*)(Args...) const>, SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(AttributeMemberFunction<R(C::*)(Args...) const>, SystemAllocator);
         typedef R(C::* FunctionPtr)(Args...) const;
 
         explicit AttributeMemberFunction(FunctionPtr f)

Code/Framework/AzCore/AzCore/RTTI/ReflectionManager.h

@@ -27,7 +27,7 @@ namespace AZ
         using IsReflectContextT = AZStd::enable_if_t<AZStd::is_base_of<ReflectContext, ReflectContextT>::value>;
 
     public:
-        AZ_CLASS_ALLOCATOR(ReflectionManager, SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(ReflectionManager, SystemAllocator);
 
         ReflectionManager() = default;
         ~ReflectionManager();

Code/Framework/AzCore/AzCore/Script/ScriptAsset.h

@@ -25,7 +25,7 @@ namespace AZ
     class LuaScriptData
     {
     public:
-        AZ_CLASS_ALLOCATOR(LuaScriptData, AZ::SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(LuaScriptData, AZ::SystemAllocator);
         AZ_TYPE_INFO(LuaScriptData, "{C62098FE-8E3F-4DD3-88F8-B11FD2609A43}");
 
         static void Reflect(AZ::ReflectContext* context);
@@ -47,7 +47,7 @@ namespace AZ
         : public Data::AssetData
     {
     public:
-        AZ_CLASS_ALLOCATOR(ScriptAsset, AZ::SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(ScriptAsset, AZ::SystemAllocator);
         AZ_RTTI(ScriptAsset, "{82557326-4AE3-416C-95D6-C70635AB7588}", Data::AssetData);
 
         static const u32 CompiledAssetSubId = 1;

Code/Framework/AzCore/AzCore/Script/ScriptContext.cpp

@@ -134,7 +134,7 @@ namespace AZ
     struct ExposedLambda
     {
         AZ_TYPE_INFO(ExposedLambda, "{B702DB0B-516B-4807-8007-DC50A5CE180A}");
-        AZ_CLASS_ALLOCATOR(ExposedLambda, AZ::SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(ExposedLambda, AZ::SystemAllocator);
 
         // assumes a lambda is at the top of the stack and will pop it
         ExposedLambda(lua_State* lua)
@@ -3420,7 +3420,7 @@ LUA_API const Node* lua_getDummyNode()
         class LuaScriptCaller : public LuaCaller
         {
         public:
-            AZ_CLASS_ALLOCATOR(LuaScriptCaller, AZ::SystemAllocator, 0);
+            AZ_CLASS_ALLOCATOR(LuaScriptCaller, AZ::SystemAllocator);
 
             LuaScriptCaller(BehaviorContext* context, BehaviorMethod* method)
             {
@@ -3602,7 +3602,7 @@ LUA_API const Node* lua_getDummyNode()
         class LuaGenericCaller : public LuaCaller
         {
         public:
-            AZ_CLASS_ALLOCATOR(LuaGenericCaller, AZ::SystemAllocator, 0);
+            AZ_CLASS_ALLOCATOR(LuaGenericCaller, AZ::SystemAllocator);
 
             LuaGenericCaller(BehaviorContext* context, BehaviorMethod* method)
             {
@@ -3732,7 +3732,7 @@ LUA_API const Node* lua_getDummyNode()
         {
         public:
             AZ_TYPE_INFO(LuaEBusHandler, "{425e6ac2-d36d-4bba-b2b4-989ef3f69597}");
-            //AZ_CLASS_ALLOCATOR(LuaEBusHandler, AZ::SystemAllocator, 0);
+            //AZ_CLASS_ALLOCATOR(LuaEBusHandler, AZ::SystemAllocator);
 
             struct HookUserData
             {
@@ -4294,7 +4294,7 @@ LUA_API const Node* lua_getDummyNode()
         public:
             typedef ScriptProperty* (*ScriptTypeFactory)(ScriptDataContext& context, int valueIndex, const char* name);
 
-            AZ_CLASS_ALLOCATOR(ScriptContextImpl, AZ::SystemAllocator, 0);
+            AZ_CLASS_ALLOCATOR(ScriptContextImpl, AZ::SystemAllocator);
 
             //////////////////////////////////////////////////////////////////////////
             ScriptContextImpl(ScriptContext* owner, IAllocator* allocator, lua_State* nativeContext)

Code/Framework/AzCore/AzCore/Script/ScriptContext.h

@@ -787,7 +787,7 @@ namespace AZ
     class ScriptContext
     {
     public:
-        AZ_CLASS_ALLOCATOR(ScriptContext, AZ::SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(ScriptContext, AZ::SystemAllocator);
 
         static const int m_maxDbgName = 512; ///< Max debug name length.
 

Code/Framework/AzCore/AzCore/Script/ScriptContextDebug.h

@@ -37,7 +37,7 @@ namespace AZ
         // path information.
         typedef AZStd::string BreakpointId;
 
-        AZ_CLASS_ALLOCATOR(ScriptContextDebug, SystemAllocator, 0)
+        AZ_CLASS_ALLOCATOR(ScriptContextDebug, SystemAllocator);
 
         ScriptContextDebug(ScriptContext& scriptContext, bool isEnableStackRecord = false);
         ~ScriptContextDebug();

Code/Framework/AzCore/AzCore/Script/ScriptDebug.h

@@ -22,7 +22,7 @@ namespace AZ
     {
     public:
         AZ_TYPE_INFO(ScriptDebug, "{FBAFA9F8-9861-41F9-A9EF-3B943B91FF4E}");
-        AZ_CLASS_ALLOCATOR(ScriptDebug, SystemAllocator, 0);
+        AZ_CLASS_ALLOCATOR(ScriptDebug, SystemAllocator);
 
         ScriptDebug() = default;
         ~ScriptDebug() = default;