Removal of dead code and bug fixes for reflection

Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
monroegm-disable-blank-issue-2
chcurran 4 years ago
parent f278bbcd65
commit 11eb920e40

@ -38,7 +38,7 @@ namespace AZ {
struct SymbolStorageDynamicallyLoadedModules struct SymbolStorageDynamicallyLoadedModules
{ {
size_t m_size; size_t m_size;
DynamicallyLoadedModuleInfo m_modules[256]; DynamicallyLoadedModuleInfo m_modules[1028];
SymbolStorageDynamicallyLoadedModules() SymbolStorageDynamicallyLoadedModules()
: m_size(0) : m_size(0)

@ -98,7 +98,7 @@ namespace LmbrCentral
if (AZ::BehaviorContext* behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context)) if (AZ::BehaviorContext* behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
{ {
behaviorContext->EBus<PolygonPrismShapeComponentRequestBus>("PolygonPrismShapeComponentRequestBus") behaviorContext->EBus<PolygonPrismShapeComponentRequestBus>("PolygonPrismShapeComponentRequestBus")
->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation) ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Common)
->Attribute(AZ::Edit::Attributes::Category, "Shape") ->Attribute(AZ::Edit::Attributes::Category, "Shape")
->Attribute(AZ::Script::Attributes::Module, "shape") ->Attribute(AZ::Script::Attributes::Module, "shape")
->Event("GetPolygonPrism", &PolygonPrismShapeComponentRequestBus::Events::GetPolygonPrism) ->Event("GetPolygonPrism", &PolygonPrismShapeComponentRequestBus::Events::GetPolygonPrism)

@ -115,7 +115,6 @@ namespace ScriptCanvas
AZ_FORCE_INLINE BehaviorContextObject() = default; AZ_FORCE_INLINE BehaviorContextObject() = default;
BehaviorContextObject& operator=(const BehaviorContextObject&) = delete; BehaviorContextObject& operator=(const BehaviorContextObject&) = delete;
BehaviorContextObject(const BehaviorContextObject&) = delete;
// copy ctor // copy ctor
AZ_FORCE_INLINE BehaviorContextObject(const void* source, const AnyTypeInfo& typeInfo, AZ::u32 flags); AZ_FORCE_INLINE BehaviorContextObject(const void* source, const AnyTypeInfo& typeInfo, AZ::u32 flags);
@ -134,6 +133,13 @@ namespace ScriptCanvas
AZ_FORCE_INLINE void add_ref(); AZ_FORCE_INLINE void add_ref();
void release(); void release();
public:
// no copying allowed, this is here to allow compile time compatibility with storage in of BehaviorContextObjectPtr AZStd::any, only
AZ_FORCE_INLINE BehaviorContextObject(const BehaviorContextObject&)
{
AZ_Assert(false, "no copying allowed, this is here to allow storage in of BehaviorContextObjectPtr AZStd::any, only");
}
}; };
AZ_FORCE_INLINE BehaviorContextObject::BehaviorContextObject(const void* value, const AnyTypeInfo& typeInfo, AZ::u32 flags) AZ_FORCE_INLINE BehaviorContextObject::BehaviorContextObject(const void* value, const AnyTypeInfo& typeInfo, AZ::u32 flags)

@ -135,11 +135,6 @@ namespace ScriptCanvasTests
// don't hang on to dangling assets // don't hang on to dangling assets
AZ::Data::AssetManager::Instance().DispatchEvents(); AZ::Data::AssetManager::Instance().DispatchEvents();
if (AZ::IO::FileIOBase* fileIO = AZ::IO::FileIOBase::GetInstance())
{
fileIO->DestroyPath(k_tempCoreAssetDir);
}
if (s_application) if (s_application)
{ {
s_application->Stop(); s_application->Stop();

@ -33,14 +33,6 @@ namespace ScriptCanvasTests
{ {
using namespace ScriptCanvas; using namespace ScriptCanvas;
#define SC_CORE_UNIT_TEST_DIR "@engroot@/LY_SC_UnitTest_ScriptCanvas_CoreCPP_Temporary"
#define SC_CORE_UNIT_TEST_NAME "serializationTest.scriptcanvas_compiled"
const char* k_tempCoreAssetDir = SC_CORE_UNIT_TEST_DIR;
const char* k_tempCoreAssetName = SC_CORE_UNIT_TEST_NAME;
const char* k_tempCoreAssetPath = SC_CORE_UNIT_TEST_DIR "/" SC_CORE_UNIT_TEST_NAME;
#undef SC_CORE_UNIT_TEST_DIR
#undef SC_CORE_UNIT_TEST_NAME
void ExpectParse(AZStd::string_view graphPath) void ExpectParse(AZStd::string_view graphPath)
{ {
AZ_TEST_START_TRACE_SUPPRESSION; AZ_TEST_START_TRACE_SUPPRESSION;

Loading…
Cancel
Save