Another xcode 12.2/macos 10.13 build fix: no optional.value()

Kingcom · Feb 1, 2023 · 5682924 · 5682924
1 parent a0e8664
commit 5682924
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Commands/CDirectiveData.cpp b/Commands/CDirectiveData.cpp
@@ -209,7 +209,7 @@ void CDirectiveData::encodeSjis()
 			if (auto unicodeValue = sjisToUnicode(SJISValue))
 			{
 				hexBuffer[0] = SJISValue & 0xFF;
-				sjisTable.addEntry(hexBuffer, 1, convertUnicodeCharToUtf8(unicodeValue.value()));
+				sjisTable.addEntry(hexBuffer, 1, convertUnicodeCharToUtf8(*unicodeValue));
 			}
 		}
 		for (unsigned short SJISValue = 0x8100; SJISValue < 0xEF00; SJISValue++)
@@ -218,7 +218,7 @@ void CDirectiveData::encodeSjis()
 			{
 				hexBuffer[0] = (SJISValue >> 8) & 0xFF;
 				hexBuffer[1] = SJISValue & 0xFF;
-				sjisTable.addEntry(hexBuffer, 2, convertUnicodeCharToUtf8(unicodeValue.value()));
+				sjisTable.addEntry(hexBuffer, 2, convertUnicodeCharToUtf8(*unicodeValue));
 			}
 		}
 	}

diff --git a/Util/FileClasses.cpp b/Util/FileClasses.cpp
@@ -847,7 +847,7 @@ char32_t TextFile::readCharacter()
 				sjis = (sjis << 8) | bufGetChar();
 
 			if (auto unicode = sjisToUnicode(sjis))
-				value = unicode.value();
+				value = *unicode;
 			else
 				errorText = tfm::format("One or more invalid Shift-JIS characters in this file");
 		}