birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes AzCore for MSVC

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-09-03 14:50:26 -07:00
parent e9dfa3f8dd
commit 2e79451280
36 changed files with 274 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzCore/AzCore/Component/ComponentApplication.cpp
+2
View File
@@ -1249,6 +1249,8 @@ namespace AZ
return AZ::SettingsRegistryInterface::VisitResponse::Continue;
}
using SettingsRegistryInterface::Visitor::Visit;
void Visit(AZStd::string_view path, AZStd::string_view valueName, AZ::SettingsRegistryInterface::Type, bool value) override
{
// By default the auto load option is true
Code/Framework/AzCore/AzCore/Debug/AssetTrackingTypes.h
+3
View File
@@ -86,6 +86,7 @@ namespace AZ
class AssetTreeNodeBase
{
public:
virtual ~AssetTreeNodeBase() = default;
virtual const AssetPrimaryInfo* GetAssetPrimaryInfo() const = 0;
virtual AssetTreeNodeBase* FindOrAddChild(const AssetTrackingId& id, const AssetPrimaryInfo* info) = 0;
};
@@ -94,6 +95,7 @@ namespace AZ
class AssetTreeBase
{
public:
virtual ~AssetTreeBase() = default;
virtual AssetTreeNodeBase& GetRoot() = 0;
};
@@ -101,6 +103,7 @@ namespace AZ
class AssetAllocationTableBase
{
public:
virtual ~AssetAllocationTableBase() = default;
virtual AssetTreeNodeBase* FindAllocation(void* ptr) const = 0;
};
}
Code/Framework/AzCore/AzCore/Debug/AssetTrackingTypesImpl.h
+5
View File
@@ -31,6 +31,8 @@ namespace AZ
{
}
~AssetTreeNode() override = default;
const AssetPrimaryInfo* GetAssetPrimaryInfo() const override
{
return m_primaryinfo;
@@ -67,6 +69,8 @@ namespace AZ
class AssetTree : public AssetTreeBase
{
public:
~AssetTree() override = default;
AssetTreeNodeBase& GetRoot() override
{
return m_rootAssets;
@@ -99,6 +103,7 @@ namespace AZ
AllocationTable(mutex_type& mutex) : m_mutex(mutex)
{
}
~AllocationTable() override = default;
AssetTreeNodeBase* FindAllocation(void* ptr) const override
{
Code/Framework/AzCore/AzCore/Debug/BudgetTracker.h
+1 -1
View File
@@ -19,7 +19,7 @@ namespace AZ::Debug
class BudgetTracker
{
public:
AZ_RTTI(BudgetTracker, "{E14A746D-BFFE-4C02-90FB-4699B79864A5}");
AZ_TYPE_INFO(BudgetTracker, "{E14A746D-BFFE-4C02-90FB-4699B79864A5}");
static Budget* GetBudgetFromEnvironment(const char* budgetName, uint32_t crc);
~BudgetTracker();
Code/Framework/AzCore/AzCore/Serialization/Json/MapSerializer.h
+3 -1
View File
@@ -46,7 +46,8 @@ namespace AZ
public:
AZ_RTTI(JsonUnorderedMapSerializer, "{EF4478D3-1820-4FDB-A7B7-C9711EB41602}", JsonMapSerializer);
AZ_CLASS_ALLOCATOR_DECL;
using JsonMapSerializer::Store;
JsonSerializationResult::Result Store(rapidjson::Value& outputValue, const void* inputValue, const void* defaultValue,
const Uuid& valueTypeId, JsonSerializerContext& context) override;
};
@@ -63,6 +64,7 @@ namespace AZ
const SerializeContext::ClassElement* keyElement, const SerializeContext::ClassElement* valueElement,
const rapidjson::Value& key, const rapidjson::Value& value, JsonDeserializerContext& context) override;
using JsonMapSerializer::Store;
JsonSerializationResult::Result Store(rapidjson::Value& outputValue, const void* inputValue, const void* defaultValue,
const Uuid& valueTypeId, JsonSerializerContext& context) override;
};
Code/Framework/AzCore/AzCore/Settings/SettingsRegistryMergeUtils.cpp
+4
View File
@@ -78,6 +78,7 @@ namespace AZ::Internal
struct EnginePathsVisitor : public AZ::SettingsRegistryInterface::Visitor
{
using AZ::SettingsRegistryInterface::Visitor::Visit;
void Visit(
[[maybe_unused]] AZStd::string_view path, AZStd::string_view valueName,
[[maybe_unused]] AZ::SettingsRegistryInterface::Type type, AZStd::string_view value) override
@@ -355,6 +356,7 @@ namespace AZ::SettingsRegistryMergeUtils
: m_settingsSpecialization{ specializations }
{}
using AZ::SettingsRegistryInterface::Visitor::Visit;
void Visit([[maybe_unused]] AZStd::string_view path, AZStd::string_view valueName,
[[maybe_unused]] AZ::SettingsRegistryInterface::Type type, bool value) override
{
@@ -761,6 +763,7 @@ namespace AZ::SettingsRegistryMergeUtils
return SettingsRegistryInterface::VisitResponse::Continue;
}
using AZ::SettingsRegistryInterface::Visitor::Visit;
void Visit(AZStd::string_view, [[maybe_unused]] AZStd::string_view valueName, SettingsRegistryInterface::Type, AZStd::string_view value) override
{
if (processingSourcePathKey)
@@ -896,6 +899,7 @@ namespace AZ::SettingsRegistryMergeUtils
struct CommandLineVisitor
: AZ::SettingsRegistryInterface::Visitor
{
using AZ::SettingsRegistryInterface::Visitor::Visit;
void Visit(AZStd::string_view, AZStd::string_view valueName, AZ::SettingsRegistryInterface::Type
, AZStd::string_view value) override
{
Code/Framework/AzCore/AzCore/UnitTest/TestTypes.h
+10 -4
View File
@@ -130,17 +130,23 @@ namespace UnitTest
, public AllocatorsBase
{
public:
// Bring in both const and non-const SetUp and TearDown function into scope to resolve warning 4266
// no override available for virtual member function from base 'benchmark::Fixture'; function is hidden
using ::benchmark::Fixture::SetUp, ::benchmark::Fixture::TearDown;
//Benchmark interface
void SetUp(const ::benchmark::State& st) override
{
AZ_UNUSED(st);
SetupAllocator();
}
void SetUp(::benchmark::State& st) override
{
AZ_UNUSED(st);
SetupAllocator();
}
void TearDown(const ::benchmark::State& st) override
{
AZ_UNUSED(st);
TeardownAllocator();
}
void TearDown(::benchmark::State& st) override
{
AZ_UNUSED(st);
Code/Framework/AzCore/AzCore/std/string/regex.h
+1 -1
View File
@@ -1758,7 +1758,7 @@ namespace AZStd
return (*this);
}
~basic_regex()
virtual ~basic_regex()
{ // destroy the object
Clear();
}