diff --git a/Code/Framework/AzCore/AzCore/Component/ComponentApplication.cpp b/Code/Framework/AzCore/AzCore/Component/ComponentApplication.cpp index 54c3edfcdc..4a6e6d035d 100644 --- a/Code/Framework/AzCore/AzCore/Component/ComponentApplication.cpp +++ b/Code/Framework/AzCore/AzCore/Component/ComponentApplication.cpp @@ -121,9 +121,9 @@ namespace AZ return environment ? environment->Get() : nullptr; } - ComponentApplication::EventLoggerDeleter::EventLoggerDeleter() noexcept = default; + ComponentApplication::EventLoggerDeleter::EventLoggerDeleter() noexcept= default; ComponentApplication::EventLoggerDeleter::EventLoggerDeleter(bool skipDelete) noexcept - : m_skipDelete{ skipDelete } + : m_skipDelete{skipDelete} {} void ComponentApplication::EventLoggerDeleter::operator()(AZ::Debug::LocalFileEventLogger* ptr) { @@ -332,27 +332,27 @@ namespace AZ ->Value("Stack trace always", Debug::AllocationRecords::RECORD_FULL); ec->Class("System memory settings", "Settings for managing application memory usage") ->ClassElement(Edit::ClassElements::EditorData, "") - ->Attribute(Edit::Attributes::AutoExpand, true) + ->Attribute(Edit::Attributes::AutoExpand, true) ->DataElement(Edit::UIHandlers::CheckBox, &Descriptor::m_grabAllMemory, "Allocate all memory at startup", "Allocate all system memory at startup if enabled, or allocate as needed if disabled") ->DataElement(Edit::UIHandlers::CheckBox, &Descriptor::m_allocationRecords, "Record allocations", "Collect information on each allocation made for debugging purposes (ignored in Release builds)") ->DataElement(Edit::UIHandlers::CheckBox, &Descriptor::m_allocationRecordsSaveNames, "Record allocations with name saving", "Saves names/filenames information on each allocation made, useful for tracking down leaks in dynamic modules (ignored in Release builds)") ->DataElement(Edit::UIHandlers::CheckBox, &Descriptor::m_allocationRecordsAttemptDecodeImmediately, "Record allocations and attempt immediate decode", "Decode callstacks for each allocation when they occur, used for tracking allocations that fail decoding. Very expensive. (ignored in Release builds)") ->DataElement(Edit::UIHandlers::ComboBox, &Descriptor::m_recordingMode, "Stack recording mode", "Stack record mode. (Ignored in final builds)") ->DataElement(Edit::UIHandlers::SpinBox, &Descriptor::m_stackRecordLevels, "Stack entries to record", "Number of stack levels to record for each allocation (ignored in Release builds)") - ->Attribute(Edit::Attributes::Step, 1) - ->Attribute(Edit::Attributes::Max, 1024) + ->Attribute(Edit::Attributes::Step, 1) + ->Attribute(Edit::Attributes::Max, 1024) ->DataElement(Edit::UIHandlers::CheckBox, &Descriptor::m_autoIntegrityCheck, "Validate allocations", "Check allocations for integrity on each allocation/free (ignored in Release builds)") ->DataElement(Edit::UIHandlers::CheckBox, &Descriptor::m_markUnallocatedMemory, "Mark freed memory", "Set memory to 0xcd when a block is freed for debugging (ignored in Release builds)") ->DataElement(Edit::UIHandlers::CheckBox, &Descriptor::m_doNotUsePools, "Don't pool allocations", "Pipe pool allocations in system/tree heap (ignored in Release builds)") ->DataElement(Edit::UIHandlers::SpinBox, &Descriptor::m_pageSize, "Page size", "Memory page size in bytes (must be OS page size aligned)") - ->Attribute(Edit::Attributes::Step, 1024) + ->Attribute(Edit::Attributes::Step, 1024) ->DataElement(Edit::UIHandlers::SpinBox, &Descriptor::m_poolPageSize, "Pool page size", "Memory pool page size in bytes (must be a multiple of page size)") - ->Attribute(Edit::Attributes::Max, &Descriptor::m_pageSize) - ->Attribute(Edit::Attributes::Step, 1024) + ->Attribute(Edit::Attributes::Max, &Descriptor::m_pageSize) + ->Attribute(Edit::Attributes::Step, 1024) ->DataElement(Edit::UIHandlers::SpinBox, &Descriptor::m_memoryBlockAlignment, "Block alignment", "Memory block alignment in bytes (must be multiple of the page size)") - ->Attribute(Edit::Attributes::Step, &Descriptor::m_pageSize) + ->Attribute(Edit::Attributes::Step, &Descriptor::m_pageSize) ->DataElement(Edit::UIHandlers::SpinBox, &Descriptor::m_memoryBlocksByteSize, "Block size", "Memory block size in bytes (must be multiple of the page size)") - ->Attribute(Edit::Attributes::Step, &Descriptor::m_pageSize) + ->Attribute(Edit::Attributes::Step, &Descriptor::m_pageSize) ->DataElement(Edit::UIHandlers::SpinBox, &Descriptor::m_reservedOS, "OS reserved memory", "System memory reserved for OS (used only when 'Allocate all memory at startup' is true)") ->DataElement(Edit::UIHandlers::SpinBox, &Descriptor::m_reservedDebug, "Memory reserved for debugger", "System memory reserved for Debug allocator, like memory tracking (used only when 'Allocate all memory at startup' is true)") ->DataElement(Edit::UIHandlers::CheckBox, &Descriptor::m_enableDrilling, "Enable Driller", "Enable Drilling support for the application (ignored in Release builds)") @@ -419,11 +419,11 @@ namespace AZ } else { - azstrcpy(m_commandLineBuffer, AZ_ARRAY_SIZE(m_commandLineBuffer), "no_argv_supplied"); + azstrcpy(m_commandLineBuffer, AZ_ARRAY_SIZE(m_commandLineBuffer), "no_argv_supplied"); // use a "valid" value here. This is because Qt and potentially other third party libraries require // that ArgC be 'at least 1' and that (*argV)[0] be a valid pointer to a real null terminated string. - m_argC = 1; - m_argV = &m_commandLineBufferAddress; + m_argC = 1; + m_argV = &m_commandLineBufferAddress; } // Create the Event logger if it doesn't exist, otherwise reuse the one registered @@ -557,8 +557,8 @@ namespace AZ void ReportBadEngineRoot() { - AZStd::string errorMessage = { "Unable to determine a valid path to the engine.\n" - "Check parameters such as --project-path and --engine-path and make sure they are valid.\n" }; + AZStd::string errorMessage = {"Unable to determine a valid path to the engine.\n" + "Check parameters such as --project-path and --engine-path and make sure they are valid.\n"}; if (auto registry = AZ::SettingsRegistry::Get(); registry != nullptr) { AZ::SettingsRegistryInterface::FixedValueString filePathErrorStr; diff --git a/Code/Framework/AzCore/AzCore/Component/ComponentApplication.h b/Code/Framework/AzCore/AzCore/Component/ComponentApplication.h index 892563fb08..8e95ff5fa3 100644 --- a/Code/Framework/AzCore/AzCore/Component/ComponentApplication.h +++ b/Code/Framework/AzCore/AzCore/Component/ComponentApplication.h @@ -377,14 +377,14 @@ namespace AZ EntityRemovedEvent m_entityRemovedEvent; EntityAddedEvent m_entityActivatedEvent; EntityRemovedEvent m_entityDeactivatedEvent; - AZ::IConsole* m_console{}; + AZ::IConsole* m_console{}; Descriptor m_descriptor; bool m_isStarted{ false }; bool m_isSystemAllocatorOwner{ false }; bool m_isOSAllocatorOwner{ false }; bool m_ownsConsole{}; - void* m_fixedMemoryBlock{ nullptr }; //!< Pointer to the memory block allocator, so we can free it OnDestroy. - IAllocatorAllocate* m_osAllocator{ nullptr }; + void* m_fixedMemoryBlock{ nullptr }; //!< Pointer to the memory block allocator, so we can free it OnDestroy. + IAllocatorAllocate* m_osAllocator{ nullptr }; EntitySetType m_entities; AZ::IO::FixedMaxPath m_exeDirectory; AZ::IO::FixedMaxPath m_engineRoot; @@ -405,11 +405,11 @@ namespace AZ // we create a buffer that can be written to (up to AZ_MAX_PATH_LEN) and then // pack it with a single param. char m_commandLineBuffer[AZ_MAX_PATH_LEN]; - char* m_commandLineBufferAddress{ m_commandLineBuffer }; + char* m_commandLineBufferAddress{ m_commandLineBuffer }; StartupParameters m_startupParameters; - char** m_argV{ nullptr }; + char** m_argV{ nullptr }; int m_argC{ 0 }; AZ::CommandLine m_commandLine; // < Stores parsed command line supplied to the constructor diff --git a/Gems/Multiplayer/Code/Source/AutoGen/Multiplayer.AutoPackets.xml b/Gems/Multiplayer/Code/Source/AutoGen/Multiplayer.AutoPackets.xml index d7602b1a3b..ee0898b681 100644 --- a/Gems/Multiplayer/Code/Source/AutoGen/Multiplayer.AutoPackets.xml +++ b/Gems/Multiplayer/Code/Source/AutoGen/Multiplayer.AutoPackets.xml @@ -40,8 +40,8 @@ - - - + + +