1 files changed, 48 insertions, 0 deletions
diff --git a/undoaction.cpp b/undoaction.cpp
new file mode 100644
index 00000000..4489eb5a
--- /dev/null
+++ b/undoaction.cpp
@@ -0,0 +1,48 @@
+// Copyright (c) 2015-2020 Vector 35 Inc
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to
+// deal in the Software without restriction, including without limitation the
+// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+// sell copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+// IN THE SOFTWARE.
+#include <cstring>
+#include "binaryninjaapi.h"
+
+using namespace BinaryNinja;
+using namespace Json;
+using namespace std;
+
+
+UndoAction::UndoAction(const BNUndoAction& action)
+{
+	actionType = action.actionType;
+	summaryText = action.summaryText;
+	summaryTokens.reserve(action.summaryTokenCount);
+	for (size_t i = 0; i < action.summaryTokenCount; i++)
+	{
+		summaryTokens.push_back(action.summaryTokens[i]);
+	}
+}
+
+
+MergeResult::MergeResult(const BNMergeResult& result)
+{
+	status = result.status;
+	if (status == BNMergeStatus::CONFLICT)
+	{
+		action = result.action;
+		hash = result.hash;
+	}
+};