diff options
| author | Xusheng <xusheng@vector35.com> | 2020-08-31 17:53:02 +0800 |
|---|---|---|
| committer | Chinmay Deshpande <chinmay1dd@gmail.com> | 2020-09-10 08:45:04 -0700 |
| commit | 10315ca50d1679a7f5ca865e500356bd246c4c4e (patch) | |
| tree | 83319cae0f873ea3ebb0905b8ac757195192a9c3 /binaryview.cpp | |
| parent | e43ca43c14f211f03892621678146f4f7894be0e (diff) | |
allow redefining an existing type
Diffstat (limited to 'binaryview.cpp')
| -rw-r--r-- | binaryview.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/binaryview.cpp b/binaryview.cpp index 3953cee6..59f14eef 100644 --- a/binaryview.cpp +++ b/binaryview.cpp @@ -2446,6 +2446,7 @@ uint64_t BinaryView::GetPreviousDataVariableStartBeforeAddress(uint64_t addr) } +<<<<<<< HEAD bool BinaryView::ParsePossibleValueSetString(const string& value, BNRegisterValueType state, PossibleValueSet& result, uint64_t here, string& errors) { BNPossibleValueSet res; |