Windows and Linux compiling
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
@@ -21,7 +21,6 @@
|
||||
////////////////////////////////////////////////////////////////////////////
|
||||
CDirectorNodeAnimator::CDirectorNodeAnimator([[maybe_unused]] CTrackViewAnimNode* pDirectorNode)
|
||||
{
|
||||
assert(m_pDirectorNode != nullptr);
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@@ -22,16 +22,12 @@
|
||||
////////////////////////////////////////////////////////////////////////////
|
||||
void CTrackViewKeyConstHandle::GetKey(IKey* pKey) const
|
||||
{
|
||||
assert(m_bIsValid);
|
||||
|
||||
m_pTrack->GetKey(m_keyIndex, pKey);
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////
|
||||
float CTrackViewKeyConstHandle::GetTime() const
|
||||
{
|
||||
assert(m_bIsValid);
|
||||
|
||||
return m_pTrack->GetKeyTime(m_keyIndex);
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -208,7 +208,7 @@ namespace AzQtComponents
|
||||
|
||||
QString PaletteCardCollection::uniquePaletteName(QSharedPointer<PaletteCard> card, const QString& name) const
|
||||
{
|
||||
const auto paletteNameExists = [this, card](const QString& name)
|
||||
const auto paletteNameExists = [this](const QString& name)
|
||||
{
|
||||
auto it = std::find_if(m_paletteCards.begin(), m_paletteCards.end(),
|
||||
[&name](QSharedPointer<const PaletteCard> card)
|
||||
|
||||
+2
-2
@@ -134,7 +134,7 @@ namespace AzToolsFramework
|
||||
{
|
||||
const auto& subFilters = compFilter->GetSubFilters();
|
||||
const auto& compFilterIter = AZStd::find_if(subFilters.cbegin(), subFilters.cend(),
|
||||
[subFilters](FilterConstType filter) -> bool
|
||||
[](FilterConstType filter) -> bool
|
||||
{
|
||||
const auto assetTypeFilter = qobject_cast<QSharedPointer<const CompositeFilter>>(filter);
|
||||
return !assetTypeFilter.isNull();
|
||||
@@ -146,7 +146,7 @@ namespace AzToolsFramework
|
||||
}
|
||||
|
||||
const auto& compositeStringFilterIter = AZStd::find_if(subFilters.cbegin(), subFilters.cend(),
|
||||
[subFilters](FilterConstType filter) -> bool
|
||||
[](FilterConstType filter) -> bool
|
||||
{
|
||||
// The real StringFilter is really a CompositeFilter with just one StringFilter in its subfilter list
|
||||
// To know if it is actually a StringFilter we have to get that subfilter and check if it is a Stringfilter.
|
||||
|
||||
@@ -4094,7 +4094,7 @@ namespace AzToolsFramework
|
||||
|
||||
using SCCommandBus = AzToolsFramework::SourceControlCommandBus;
|
||||
SCCommandBus::Broadcast(&SCCommandBus::Events::RequestEdit, fullFilePath.c_str(), true,
|
||||
[sliceEntity, fullFilePath, tmpFileName, tmpFilesaved](bool /*success*/, const AzToolsFramework::SourceControlFileInfo& info)
|
||||
[fullFilePath, tmpFileName, tmpFilesaved](bool /*success*/, const AzToolsFramework::SourceControlFileInfo& info)
|
||||
{
|
||||
if (!info.IsReadOnly())
|
||||
{
|
||||
|
||||
@@ -33,7 +33,8 @@ namespace UnitTest
|
||||
CompareInstances(*firstInstance, *secondInstance, true, false);
|
||||
}
|
||||
|
||||
TEST_F(PrefabInstantiateTest, PrefabInstantiate_TripleNestingTemplate_InstantiateSucceeds)
|
||||
// TODO: Issue #3398 will re-enable
|
||||
TEST_F(PrefabInstantiateTest, DISABLED_PrefabInstantiate_TripleNestingTemplate_InstantiateSucceeds)
|
||||
{
|
||||
AZ::Entity* newEntity = CreateEntity("New Entity");
|
||||
AzToolsFramework::EditorEntityContextRequestBus::Broadcast(
|
||||
|
||||
@@ -82,7 +82,7 @@ namespace AZ
|
||||
AZ_Printf("Convert", "Converting '%s'\n", filePath.c_str());
|
||||
|
||||
PathDocumentContainer documents;
|
||||
auto callback = [&result, &documents, &extension, &convertSettings, &verifySettings, skipVerify]
|
||||
auto callback = [&result, &documents, &convertSettings, &verifySettings, skipVerify]
|
||||
(void* classPtr, const Uuid& classId, SerializeContext* /*context*/)
|
||||
{
|
||||
rapidjson::Document document;
|
||||
@@ -346,7 +346,7 @@ namespace AZ
|
||||
// Convert the supplied file list to an absolute path
|
||||
AZStd::optional<AZ::IO::FixedMaxPathString> absFilePath = AZ::Utils::ConvertToAbsolutePath(configFileView);
|
||||
AZ::IO::FixedMaxPath configFilePath = absFilePath ? *absFilePath : configFileView;
|
||||
auto callback = [&documents, &outputExtension, &configFilePath](AZ::IO::PathView configFileView, bool isFile) -> bool
|
||||
auto callback = [&documents, &configFilePath](AZ::IO::PathView configFileView, bool isFile) -> bool
|
||||
{
|
||||
if (configFileView == "." || configFileView == "..")
|
||||
{
|
||||
|
||||
+2
-2
@@ -64,7 +64,7 @@ namespace TestImpact
|
||||
return !name.starts_with("DISABLED_") && name.find("/DISABLED_") == AZStd::string::npos;
|
||||
};
|
||||
|
||||
const auto getDuration = [&Keys](const AZ::rapidxml::xml_node<>* node)
|
||||
const auto getDuration = [](const AZ::rapidxml::xml_node<>* node)
|
||||
{
|
||||
const AZStd::string duration = node->first_attribute(Keys[DurationKey])->value();
|
||||
return AZStd::chrono::milliseconds(static_cast<AZStd::sys_time_t>(AZStd::stof(duration) * 1000.f));
|
||||
@@ -78,7 +78,7 @@ namespace TestImpact
|
||||
for (auto testcase_node = testsuite_node->first_node(Keys[TestCaseKey]); testcase_node;
|
||||
testcase_node = testcase_node->next_sibling())
|
||||
{
|
||||
const auto getStatus = [&Keys](const AZ::rapidxml::xml_node<>* node)
|
||||
const auto getStatus = [](const AZ::rapidxml::xml_node<>* node)
|
||||
{
|
||||
const AZStd::string status = node->first_attribute(Keys[StatusKey])->value();
|
||||
if (status == Keys[RunKey])
|
||||
|
||||
+2
-2
@@ -87,7 +87,7 @@ namespace TestImpact
|
||||
{
|
||||
for (const auto& parentTarget : sourceDependency.GetParentTargets())
|
||||
{
|
||||
AZStd::visit([&selectedTestTargetMap, &sourceDependency, this](auto&& target)
|
||||
AZStd::visit([&selectedTestTargetMap, &sourceDependency](auto&& target)
|
||||
{
|
||||
if constexpr (IsProductionTarget<decltype(target)>)
|
||||
{
|
||||
@@ -129,7 +129,7 @@ namespace TestImpact
|
||||
{
|
||||
for (const auto& parentTarget : sourceDependency.GetParentTargets())
|
||||
{
|
||||
AZStd::visit([&selectedTestTargetMap, &sourceDependency, this](auto&& target)
|
||||
AZStd::visit([&selectedTestTargetMap](auto&& target)
|
||||
{
|
||||
if constexpr (IsTestTarget<decltype(target)>)
|
||||
{
|
||||
|
||||
+2
-2
@@ -107,7 +107,7 @@ namespace TestImpact
|
||||
}
|
||||
|
||||
// Wrapper around low-level process launch callback to gather job meta-data and present a simplified callback interface to the client
|
||||
const ProcessLaunchCallback processLaunchCallback = [&jobCallback, &jobInfos, &metas](
|
||||
const ProcessLaunchCallback processLaunchCallback = [&jobCallback, &metas](
|
||||
TestImpact::ProcessId pid,
|
||||
TestImpact::LaunchResult launchResult,
|
||||
AZStd::chrono::high_resolution_clock::time_point createTime)
|
||||
@@ -126,7 +126,7 @@ namespace TestImpact
|
||||
};
|
||||
|
||||
// Wrapper around low-level process exit callback to gather job meta-data and present a simplified callback interface to the client
|
||||
const ProcessExitCallback processExitCallback = [&jobCallback, &jobInfos, &metas](
|
||||
const ProcessExitCallback processExitCallback = [&jobCallback, &metas](
|
||||
TestImpact::ProcessId pid,
|
||||
TestImpact::ExitCondition exitCondition,
|
||||
TestImpact::ReturnCode returnCode,
|
||||
|
||||
+1
-1
@@ -151,7 +151,7 @@ namespace TestImpact
|
||||
}
|
||||
*/
|
||||
|
||||
const auto payloadGenerator = [this](const JobDataMap& jobDataMap)
|
||||
const auto payloadGenerator = [](const JobDataMap& jobDataMap)
|
||||
{
|
||||
PayloadMap<Job> enumerations;
|
||||
for (const auto& [jobId, jobData] : jobDataMap)
|
||||
|
||||
+1
-1
@@ -40,7 +40,7 @@ namespace TestImpact
|
||||
AZStd::optional<AZStd::chrono::milliseconds> runnerTimeout,
|
||||
AZStd::optional<ClientJobCallback> clientCallback)
|
||||
{
|
||||
const auto payloadGenerator = [this](const JobDataMap& jobDataMap)
|
||||
const auto payloadGenerator = [](const JobDataMap& jobDataMap)
|
||||
{
|
||||
PayloadMap<Job> runs;
|
||||
for (const auto& [jobId, jobData] : jobDataMap)
|
||||
|
||||
+1
-1
@@ -28,7 +28,7 @@ namespace TestImpact
|
||||
AZStd::optional<AZStd::chrono::milliseconds> runnerTimeout,
|
||||
AZStd::optional<ClientJobCallback> clientCallback)
|
||||
{
|
||||
const auto payloadGenerator = [this](const JobDataMap& jobDataMap)
|
||||
const auto payloadGenerator = [](const JobDataMap& jobDataMap)
|
||||
{
|
||||
PayloadMap<Job> runs;
|
||||
for (const auto& [jobId, jobData] : jobDataMap)
|
||||
|
||||
@@ -323,7 +323,7 @@ namespace TestImpact
|
||||
void Runtime::EnumerateMutatedTestTargets(const ChangeDependencyList& changeDependencyList)
|
||||
{
|
||||
AZStd::vector<const TestTarget*> testTargets;
|
||||
const auto addMutatedTestTargetsToEnumerationList = [this, &testTargets](const AZStd::vector<SourceDependency>& sourceDependencies)
|
||||
const auto addMutatedTestTargetsToEnumerationList = [&testTargets](const AZStd::vector<SourceDependency>& sourceDependencies)
|
||||
{
|
||||
for (const auto& sourceDependency : sourceDependencies)
|
||||
{
|
||||
|
||||
@@ -138,7 +138,7 @@ namespace AZ
|
||||
commandAllocatorPoolDescriptor.m_collectLatency = descriptor.m_frameCountMax;
|
||||
commandAllocatorPool.Init(commandAllocatorPoolDescriptor);
|
||||
|
||||
m_commandListSubAllocators[queueIdx].SetInitFunction([this, &commandListPool, &commandAllocatorPool]
|
||||
m_commandListSubAllocators[queueIdx].SetInitFunction([&commandListPool, &commandAllocatorPool]
|
||||
(Internal::CommandListSubAllocator& subAllocator)
|
||||
{
|
||||
subAllocator.Init(commandAllocatorPool, commandListPool);
|
||||
|
||||
@@ -108,7 +108,7 @@ namespace AZ
|
||||
|
||||
void CommandQueue::QueueGpuSignal(Fence& fence)
|
||||
{
|
||||
QueueCommand([this, &fence](void* commandQueue)
|
||||
QueueCommand([&fence](void* commandQueue)
|
||||
{
|
||||
AZ_PROFILE_SCOPE(AzRender, "SignalFence");
|
||||
ID3D12CommandQueue* dx12CommandQueue = static_cast<ID3D12CommandQueue*>(commandQueue);
|
||||
|
||||
+2
-2
@@ -84,7 +84,7 @@ namespace ShaderManagementConsole
|
||||
}
|
||||
});
|
||||
|
||||
menu->addAction("Duplicate...", [entry, caller]()
|
||||
menu->addAction("Duplicate...", [entry]()
|
||||
{
|
||||
const QFileInfo duplicateFileInfo(AtomToolsFramework::GetDuplicationFileInfo(entry->GetFullPath().c_str()));
|
||||
if (!duplicateFileInfo.absoluteFilePath().isEmpty())
|
||||
@@ -189,7 +189,7 @@ namespace ShaderManagementConsole
|
||||
});
|
||||
|
||||
// add get latest action
|
||||
m_getLatestAction = sourceControlMenu->addAction("Get Latest", [path, this]()
|
||||
m_getLatestAction = sourceControlMenu->addAction("Get Latest", [path]()
|
||||
{
|
||||
SourceControlCommandBus::Broadcast(&SourceControlCommandBus::Events::RequestLatest, path.c_str(),
|
||||
[](bool, const SourceControlFileInfo&) {});
|
||||
|
||||
+5
-5
@@ -202,7 +202,7 @@ namespace ShaderManagementConsole
|
||||
// Generating the main menu manually because it's easier and we will have some dynamic or data driven entries
|
||||
m_menuFile = menuBar()->addMenu("&File");
|
||||
|
||||
m_actionOpen = m_menuFile->addAction("&Open...", [this]() {
|
||||
m_actionOpen = m_menuFile->addAction("&Open...", []() {
|
||||
const AZStd::vector<AZ::Data::AssetType> assetTypes = {
|
||||
};
|
||||
|
||||
@@ -256,7 +256,7 @@ namespace ShaderManagementConsole
|
||||
AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Broadcast(&AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Events::CloseDocument, documentId);
|
||||
}, QKeySequence::Close);
|
||||
|
||||
m_actionCloseAll = m_menuFile->addAction("Close All", [this]() {
|
||||
m_actionCloseAll = m_menuFile->addAction("Close All", []() {
|
||||
AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Broadcast(&AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Events::CloseAllDocuments);
|
||||
});
|
||||
|
||||
@@ -305,7 +305,7 @@ namespace ShaderManagementConsole
|
||||
|
||||
m_menuEdit->addSeparator();
|
||||
|
||||
m_actionSettings = m_menuEdit->addAction("&Settings...", [this]() {
|
||||
m_actionSettings = m_menuEdit->addAction("&Settings...", []() {
|
||||
}, QKeySequence::Preferences);
|
||||
m_actionSettings->setEnabled(false);
|
||||
|
||||
@@ -334,10 +334,10 @@ namespace ShaderManagementConsole
|
||||
|
||||
m_menuHelp = menuBar()->addMenu("&Help");
|
||||
|
||||
m_actionHelp = m_menuHelp->addAction("&Help...", [this]() {
|
||||
m_actionHelp = m_menuHelp->addAction("&Help...", []() {
|
||||
});
|
||||
|
||||
m_actionAbout = m_menuHelp->addAction("&About...", [this]() {
|
||||
m_actionAbout = m_menuHelp->addAction("&About...", []() {
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -14,16 +14,12 @@
|
||||
////////////////////////////////////////////////////////////////////////////
|
||||
void CUiAnimViewKeyConstHandle::GetKey(IKey* pKey) const
|
||||
{
|
||||
assert(m_bIsValid);
|
||||
|
||||
m_pTrack->GetKey(m_keyIndex, pKey);
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////
|
||||
float CUiAnimViewKeyConstHandle::GetTime() const
|
||||
{
|
||||
assert(m_bIsValid);
|
||||
|
||||
return m_pTrack->GetKeyTime(m_keyIndex);
|
||||
}
|
||||
|
||||
|
||||
@@ -236,14 +236,14 @@ void HierarchyMenu::SliceMenuItems(HierarchyWidget* hierarchy,
|
||||
if (showMask & Show::kNewSlice)
|
||||
{
|
||||
QAction* action = addAction("Make Cascaded Slice from Selected Slices && Entities...");
|
||||
QObject::connect(action, &QAction::triggered, hierarchy, [hierarchy, selectedEntities]
|
||||
QObject::connect(action, &QAction::triggered, hierarchy, [hierarchy]
|
||||
{
|
||||
hierarchy->GetEditorWindow()->GetSliceManager()->MakeSliceFromSelectedItems(hierarchy, true);
|
||||
}
|
||||
);
|
||||
|
||||
action = addAction(QObject::tr("Make Detached Slice from Selected Entities..."));
|
||||
QObject::connect(action, &QAction::triggered, hierarchy, [hierarchy, selectedEntities]
|
||||
QObject::connect(action, &QAction::triggered, hierarchy, [hierarchy]
|
||||
{
|
||||
hierarchy->GetEditorWindow()->GetSliceManager()->MakeSliceFromSelectedItems(hierarchy, false);
|
||||
}
|
||||
|
||||
@@ -503,7 +503,7 @@ namespace ScriptCanvasEditor
|
||||
m_pendingSave.emplace_back(normPath);
|
||||
|
||||
m_assetSaveFinalizer.Reset();
|
||||
m_assetSaveFinalizer.Start(this, fileInfo, saveInfo, onSaveCallback, AssetSaveFinalizer::OnCompleteHandler([saveInfo](AZ::Data::AssetId /*assetId*/)
|
||||
m_assetSaveFinalizer.Start(this, fileInfo, saveInfo, onSaveCallback, AssetSaveFinalizer::OnCompleteHandler([](AZ::Data::AssetId /*assetId*/)
|
||||
{
|
||||
}));
|
||||
}
|
||||
|
||||
@@ -582,7 +582,7 @@ namespace Vegetation
|
||||
}
|
||||
|
||||
//offloading garbage collection to job to save time deallocating tasks on main thread
|
||||
auto garbageCollectionJob = AZ::CreateJobFunction([removedTasksPtr]() mutable {}, true);
|
||||
auto garbageCollectionJob = AZ::CreateJobFunction([]() mutable {}, true);
|
||||
garbageCollectionJob->Start();
|
||||
}
|
||||
|
||||
|
||||
@@ -397,7 +397,7 @@ namespace WhiteBox
|
||||
|
||||
const auto edgeHandlesPair = Api::MeshUserEdgeHandles(*whiteBox);
|
||||
|
||||
const auto edgeHandles = [whiteBox, edgeSelectionMode, &edgeHandlesPair]()
|
||||
const auto edgeHandles = [edgeSelectionMode, &edgeHandlesPair]()
|
||||
{
|
||||
switch (edgeSelectionMode)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user