Skip to content

Cherry-pick C++20 fixes to stabilization/25100 #719

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HydrogenC wants to merge 2 commits into
base: development
Choose a base branch
from
+7 −7
Open

Cherry-pick C++20 fixes to stabilization/25100 #719

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5578680
Re-enable deprecated-this-capture warning
mapret Jul 30, 2025
dd81cf8
Fixes "Unused Variable" warnings for 25.05.1
nick-l-o3de Jul 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gem/Code/Source/ExposureExampleComponent.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ namespace AtomSampleViewer
m_pointLight = lightHandle;
}

void ExposureExampleComponent::OnModelReady(AZ::Data::Instance<AZ::RPI::Model> model)
void ExposureExampleComponent::OnModelReady([[maybe_unused]] AZ::Data::Instance<AZ::RPI::Model> model)
{
m_sponzaAssetLoaded = true;

Expand Down
2 changes: 1 addition & 1 deletion Gem/Code/Source/RHI/CopyQueueComponent.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ namespace AtomSampleViewer

RHI::EmptyCompileFunction<ScopeData> compileFunction;

const auto executeFunction = [=](const RHI::FrameGraphExecuteContext& context, [[maybe_unused]] const ScopeData& scopeData)
const auto executeFunction = [this](const RHI::FrameGraphExecuteContext& context, [[maybe_unused]] const ScopeData& scopeData)
{

RHI::CommandList* commandList = context.GetCommandList();
Expand Down
2 changes: 1 addition & 1 deletion Gem/Code/Source/RHI/MultiGPUExampleComponent.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -599,7 +599,7 @@ namespace AtomSampleViewer
m_shaderResourceGroupComposite->Compile(m_shaderResourceGroupDataComposite);
};

const auto executeFunction = [=](const RHI::FrameGraphExecuteContext& context, [[maybe_unused]] const ScopeData& scopeData)
const auto executeFunction = [this](const RHI::FrameGraphExecuteContext& context, [[maybe_unused]] const ScopeData& scopeData)
{
RHI::CommandList* commandList = context.GetCommandList();

Expand Down
2 changes: 1 addition & 1 deletion Gem/Code/Source/RHI/SphericalHarmonicsExampleComponent.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ namespace AtomSampleViewer
}
};

const auto executeFunction = [=]([[maybe_unused]] const RHI::FrameGraphExecuteContext& context, [[maybe_unused]] const ScopeData& scopeData)
const auto executeFunction = [this]([[maybe_unused]] const RHI::FrameGraphExecuteContext& context, [[maybe_unused]] const ScopeData& scopeData)
{
RHI::CommandList* commandList = context.GetCommandList();

Expand Down
2 changes: 1 addition & 1 deletion Gem/Code/Source/RHI/Texture3dExampleComponent.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ namespace AtomSampleViewer
m_shaderResourceGroup->Compile();
};

const auto executeFunction = [=]([[maybe_unused]] const RHI::FrameGraphExecuteContext& context, [[maybe_unused]] const ScopeData& scopeData)
const auto executeFunction = [this]([[maybe_unused]] const RHI::FrameGraphExecuteContext& context, [[maybe_unused]] const ScopeData& scopeData)
{
RHI::CommandList* commandList = context.GetCommandList();

Expand Down
2 changes: 1 addition & 1 deletion Gem/Code/Source/RHI/TextureExampleComponent.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ namespace AtomSampleViewer
}
};

const auto executeFunction = [=](const RHI::FrameGraphExecuteContext& context, [[maybe_unused]] const ScopeData& scopeData)
const auto executeFunction = [this](const RHI::FrameGraphExecuteContext& context, [[maybe_unused]] const ScopeData& scopeData)
{
RHI::CommandList* commandList = context.GetCommandList();

Expand Down
2 changes: 1 addition & 1 deletion Gem/Code/Source/SsaoExampleComponent.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ namespace AtomSampleViewer

// --- World Model ---

void SsaoExampleComponent::OnModelReady(AZ::Data::Instance<AZ::RPI::Model> model)
void SsaoExampleComponent::OnModelReady([[maybe_unused]] AZ::Data::Instance<AZ::RPI::Model> model)
{
m_worldModelAssetLoaded = true;
}
Expand Down