Skip to content

Commit 534e953

Browse files
Naming clash fix that happens with newest cmake. (o3de#17647)
Caused by this file being compiled with AssetProcessorManagerTest.h/cpp which also has the AssetProcessorManager_Test class when using unity build. Happens with cmake-2.28.4 and newer. Signed-off-by: Joerg H. Mueller <[email protected]>
1 parent b8114db commit 534e953

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

Code/Tools/AssetProcessor/native/unittests/AssetProcessorManagerUnitTests.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ namespace AssetProcessor
2525
using namespace AzToolsFramework::AssetSystem;
2626
using namespace AzToolsFramework::AssetDatabase;
2727

28-
class AssetProcessorManager_Test
28+
class AssetProcessorManagerUnit_Test
2929
: public AssetProcessorManager
3030
{
3131
public:
32-
explicit AssetProcessorManager_Test(PlatformConfiguration* config, QObject* parent = 0)
32+
explicit AssetProcessorManagerUnit_Test(PlatformConfiguration* config, QObject* parent = 0)
3333
: AssetProcessorManager(config, parent)
3434
{}
3535

@@ -105,7 +105,7 @@ namespace AssetProcessor
105105
m_config.AddMetaDataType("exportsettings", QString());
106106

107107
// Configure asset processor manager
108-
m_assetProcessorManager = AZStd::make_unique<AssetProcessorManager_Test>(&m_config); // note, this will 'push' the scan folders in to the db.
108+
m_assetProcessorManager = AZStd::make_unique<AssetProcessorManagerUnit_Test>(&m_config); // note, this will 'push' the scan folders in to the db.
109109

110110
m_assetProcessorConnections.append(connect(m_assetProcessorManager.get(), &AssetProcessorManager::AssetToProcess,
111111
this, [&](JobDetails details)
@@ -2505,7 +2505,7 @@ namespace AssetProcessor
25052505

25062506
{
25072507
// create this, which will write those scan folders into the db as-is
2508-
AssetProcessorManager_Test apm(&config2);
2508+
AssetProcessorManagerUnit_Test apm(&config2);
25092509
apm.CheckMissingFiles();
25102510
}
25112511

Code/Tools/AssetProcessor/native/unittests/AssetProcessorManagerUnitTests.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
namespace AssetProcessor
2020
{
21-
class AssetProcessorManager_Test;
21+
class AssetProcessorManagerUnit_Test;
2222

2323
class AssetProcessorManagerUnitTests
2424
: public QObject
@@ -55,7 +55,7 @@ namespace AssetProcessor
5555
QList<QPair<QString, QString>> m_changedInputResults;
5656
QList<AzFramework::AssetSystem::AssetNotificationMessage> m_assetMessages;
5757

58-
AZStd::unique_ptr<AssetProcessorManager_Test> m_assetProcessorManager;
58+
AZStd::unique_ptr<AssetProcessorManagerUnit_Test> m_assetProcessorManager;
5959
PlatformConfiguration m_config;
6060
};
6161
} // namespace assetprocessor

0 commit comments

Comments
 (0)