From 97758d5c47698339cfcb9037e477ff463f97b58a Mon Sep 17 00:00:00 2001 From: rtk0c Date: Sun, 9 May 2021 11:19:37 -0700 Subject: Remove UNREACHABLE macros --- core/src/Model/Workflow/Nodes/NumericNodes.cpp | 2 -- core/src/Model/Workflow/Nodes/TextNodes.cpp | 1 - core/src/Model/Workflow/Value_RTTI.cpp | 4 ++-- core/src/Model/Workflow/Workflow_RTTI.cpp | 4 ++-- core/src/Utils/Macros.hpp | 6 ------ 5 files changed, 4 insertions(+), 13 deletions(-) (limited to 'core/src') diff --git a/core/src/Model/Workflow/Nodes/NumericNodes.cpp b/core/src/Model/Workflow/Nodes/NumericNodes.cpp index 138b35d..7893377 100644 --- a/core/src/Model/Workflow/Nodes/NumericNodes.cpp +++ b/core/src/Model/Workflow/Nodes/NumericNodes.cpp @@ -15,7 +15,6 @@ WorkflowNode::Kind NumericOperationNode::OperationTypeToNodeKind(OperationType t case Subtraction: return KD_NumericSubtraction; case Multiplication: return KD_NumericMultiplication; case Division: return KD_NumericDivision; - default: UNREACHABLE; } } @@ -26,7 +25,6 @@ NumericOperationNode::OperationType NumericOperationNode::NodeKindToOperationTyp case KD_NumericSubtraction: return Subtraction; case KD_NumericMultiplication: return Multiplication; case KD_NumericDivision: return Division; - default: UNREACHABLE; } } diff --git a/core/src/Model/Workflow/Nodes/TextNodes.cpp b/core/src/Model/Workflow/Nodes/TextNodes.cpp index 944fc07..b70290d 100644 --- a/core/src/Model/Workflow/Nodes/TextNodes.cpp +++ b/core/src/Model/Workflow/Nodes/TextNodes.cpp @@ -44,7 +44,6 @@ BaseValue::Kind TextFormatterNode::ArgumentTypeToValueKind(TextFormatterNode::Ar case NumericArgument: return BaseValue::KD_Numeric; case TextArgument: return BaseValue::KD_Text; case DateTimeArgument: return BaseValue::KD_DateTime; - default: UNREACHABLE; } } diff --git a/core/src/Model/Workflow/Value_RTTI.cpp b/core/src/Model/Workflow/Value_RTTI.cpp index a660557..a0c3213 100644 --- a/core/src/Model/Workflow/Value_RTTI.cpp +++ b/core/src/Model/Workflow/Value_RTTI.cpp @@ -9,7 +9,7 @@ const char* BaseValue::FormatKind(Kind kind) case KD_Numeric: return "Numeric"; case KD_Text: return "Text"; case KD_DateTime: return "Date/time"; - case InvalidKind: UNREACHABLE; + case InvalidKind: return ""; } } @@ -19,6 +19,6 @@ std::unique_ptr BaseValue::CreateByKind(BaseValue::Kind kind) case KD_Numeric: return std::make_unique(); case KD_Text: return std::make_unique(); case KD_DateTime: return std::make_unique(); - case InvalidKind: UNREACHABLE; + case InvalidKind: return nullptr; } } diff --git a/core/src/Model/Workflow/Workflow_RTTI.cpp b/core/src/Model/Workflow/Workflow_RTTI.cpp index 0f8fd2e..c16b8d1 100644 --- a/core/src/Model/Workflow/Workflow_RTTI.cpp +++ b/core/src/Model/Workflow/Workflow_RTTI.cpp @@ -21,7 +21,7 @@ const char* WorkflowNode::FormatKind(Kind kind) case KD_FormInput: return "FormInput"; case KD_DatabaseRowsInput: return "DatabaseRowsInput"; - case InvalidKind: UNREACHABLE; + case InvalidKind: return ""; } } @@ -48,6 +48,6 @@ std::unique_ptr WorkflowNode::CreateByKind(WorkflowNode::Kind kind case KD_FormInput: return std::make_unique(); case KD_DatabaseRowsInput: return std::make_unique(); - case InvalidKind: UNREACHABLE; + case InvalidKind: return ""; } } diff --git a/core/src/Utils/Macros.hpp b/core/src/Utils/Macros.hpp index 3ba8261..658aebf 100644 --- a/core/src/Utils/Macros.hpp +++ b/core/src/Utils/Macros.hpp @@ -4,9 +4,3 @@ #define CONCAT(a, b) CONCAT_IMPL(a, b) #define UNIQUE_NAME(prefix) CONCAT(prefix, __COUNTER__) - -#if defined(_MSC_VER) -# define UNREACHABLE __assume(false) -#elif defined(__clang__) || defined(__GNUC__) -# define UUNREACHABLE __builtin_unreachable() -#endif -- cgit v1.2.3-70-g09d2