diff options
author | rtk0c <[email protected]> | 2021-06-30 11:53:50 -0700 |
---|---|---|
committer | rtk0c <[email protected]> | 2021-06-30 11:53:50 -0700 |
commit | c2c9452cdd6f50923c02d59c68087add8d17f03a (patch) | |
tree | daad31af4f828cb7396da64dc33488c3d7698a4f /core/src/Model | |
parent | 782e95613da7fb2eb7a2fe9c3c9fbb5b6f756b09 (diff) |
Fix notable warnings (from gcc)
Diffstat (limited to 'core/src/Model')
-rw-r--r-- | core/src/Model/Workflow/Evaluation.cpp | 18 | ||||
-rw-r--r-- | core/src/Model/Workflow/Value_RTTI.cpp | 11 | ||||
-rw-r--r-- | core/src/Model/Workflow/Values/Basic.cpp | 6 | ||||
-rw-r--r-- | core/src/Model/Workflow/Workflow_Main.cpp | 2 |
4 files changed, 17 insertions, 20 deletions
diff --git a/core/src/Model/Workflow/Evaluation.cpp b/core/src/Model/Workflow/Evaluation.cpp index f6472dd..7035bf9 100644 --- a/core/src/Model/Workflow/Evaluation.cpp +++ b/core/src/Model/Workflow/Evaluation.cpp @@ -39,18 +39,16 @@ std::string WorkflowEvaluationError::Format() const return result; } -namespace { -enum class EvaluationStatus -{ - Unevaluated, - Success, - Failed, -}; -} // namespace - struct WorkflowEvaluationContext::RuntimeNode { - EvaluationStatus Status = EvaluationStatus::Unevaluated; + enum EvaluationStatus + { + ST_Unevaluated, + ST_Success, + ST_Failed, + }; + + EvaluationStatus Status = ST_Unevaluated; }; struct WorkflowEvaluationContext::RuntimeConnection diff --git a/core/src/Model/Workflow/Value_RTTI.cpp b/core/src/Model/Workflow/Value_RTTI.cpp index 121fa14..0561239 100644 --- a/core/src/Model/Workflow/Value_RTTI.cpp +++ b/core/src/Model/Workflow/Value_RTTI.cpp @@ -7,6 +7,11 @@ #include "UI/UI.hpp" #include "Utils/I18n.hpp" +constexpr BaseValue::KindInfo kEmptyInfo{ + .PinIcon = ImGui::IconType::Circle, + .PinColor = RgbaColor(), +}; + constexpr BaseValue::KindInfo kNumericInfo{ .PinIcon = ImGui::IconType::Circle, .PinColor = RgbaColor(147, 226, 74), @@ -42,7 +47,7 @@ constexpr BaseValue::KindInfo kDatabaseRowInfo{ .PinColor = RgbaColor(15, 124, 196), }; -constexpr BaseValue::KindInfo kObjectinfo{ +constexpr BaseValue::KindInfo kObjectInfo{ .PinIcon = ImGui::IconType::Square, .PinColor = RgbaColor(161, 161, 161), }; @@ -57,14 +62,14 @@ const BaseValue::KindInfo& BaseValue::QueryInfo(BaseValue::Kind kind) case KD_List: return kListInfo; case KD_Dictionary: return kDictionaryInfo; - case KD_BaseObject: return kObjectinfo; + case KD_BaseObject: return kObjectInfo; case KD_SaleDatabaseRow: case KD_PurchaseDatabaseRow: return kDatabaseRowInfo; case InvalidKind: break; } - // TODO provide info here + return kEmptyInfo; } const char* BaseValue::Format(Kind kind) diff --git a/core/src/Model/Workflow/Values/Basic.cpp b/core/src/Model/Workflow/Values/Basic.cpp index d6a2395..198387c 100644 --- a/core/src/Model/Workflow/Values/Basic.cpp +++ b/core/src/Model/Workflow/Values/Basic.cpp @@ -18,18 +18,12 @@ template <class T, int kMaxSize> static std::string NumberToString(T value) { char buf[kMaxSize]; - -#if PLATFORM_WIN32 auto res = std::to_chars(buf, buf + kMaxSize, value); if (res.ec == std::errc()) { return std::string(buf, res.ptr); } else { return "<err>"; } -#else - // TODO libstdc++ doesn't have floating point charconv yet - return std::to_string(value); -#endif } std::string NumericValue::GetTruncatedString() const diff --git a/core/src/Model/Workflow/Workflow_Main.cpp b/core/src/Model/Workflow/Workflow_Main.cpp index af5103d..2dbed58 100644 --- a/core/src/Model/Workflow/Workflow_Main.cpp +++ b/core/src/Model/Workflow/Workflow_Main.cpp @@ -25,8 +25,8 @@ namespace ImNodes = ax::NodeEditor; WorkflowConnection::WorkflowConnection() : Id{ 0 } , SourceNode{ WorkflowNode::kInvalidId } - , DestinationNode{ WorkflowNode::kInvalidId } , SourcePin{ WorkflowNode::kInvalidPinId } + , DestinationNode{ WorkflowNode::kInvalidId } , DestinationPin{ WorkflowNode::kInvalidPinId } { } |