From 8217b0812816b7a9fdbd9b70301735c78a69bc3c Mon Sep 17 00:00:00 2001 From: Stephen Anthony Date: Fri, 10 May 2024 20:51:40 -0230 Subject: [PATCH] Fixed string vs. string_view code that works in VS but not gcc/clang. --- src/emucore/KidVid.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/emucore/KidVid.cxx b/src/emucore/KidVid.cxx index 36d2f504c..73ade243c 100644 --- a/src/emucore/KidVid.cxx +++ b/src/emucore/KidVid.cxx @@ -241,7 +241,7 @@ bool KidVid::load(Serializer& in) // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - string KidVid::getFileName() const { - static constexpr std::array fileNames = { + static constexpr std::array fileNames = { "KVS3.WAV", "KVS1.WAV", "KVS2.WAV", "KVB3.WAV", "KVB1.WAV", "KVB2.WAV" }; @@ -249,7 +249,7 @@ string KidVid::getFileName() const int i = myGame == Game::Smurfs ? myTape - 1 : myTape + 2; if(myTape == 4) i = 3; - return fileNames[i]; + return string{fileNames[i]}; } // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -