From 4932f36da4fab3fc8965822bba473cbd20f7f405 Mon Sep 17 00:00:00 2001 From: rtk0c Date: Fri, 12 Nov 2021 13:34:50 -0800 Subject: Fix compile errors under MSVC, remove PLATFORM_* macros in favor of compiler builtin macros, and add win32 support to FileStream --- core/src/Model/Workflow/Workflow.hpp | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'core/src/Model/Workflow/Workflow.hpp') diff --git a/core/src/Model/Workflow/Workflow.hpp b/core/src/Model/Workflow/Workflow.hpp index c156582..3c4d320 100644 --- a/core/src/Model/Workflow/Workflow.hpp +++ b/core/src/Model/Workflow/Workflow.hpp @@ -193,14 +193,15 @@ protected: class Workflow : public Asset { + friend class WorkflowNode; + friend class WorkflowEvaluationContext; + class Private; + public: using CategoryType = WorkflowAssetList; static constinit const WorkflowAssetList Category; private: - friend class WorkflowNode; - friend class WorkflowEvaluationContext; - std::vector mConnections; std::vector> mNodes; std::vector> mConstants; @@ -279,13 +280,8 @@ public: /* Serialization */ - enum ReadResult - { - RR_Success, - RR_InvalidVersion, - }; - ReadResult ReadFrom(std::istream& stream); - void WriteTo(std::ostream& stream) const; + void ReadFromDataStream(InputDataStream& stream); + void WriteToDataStream(OutputDataStream& stream) const; private: std::pair AllocWorkflowConnection(); -- cgit v1.2.3-70-g09d2