Fixed string vs. string_view code that works in VS but not gcc/clang.

stella-emu · May 10, 2024 · 7d99a61 · 7d99a61
1 parent a8a23f6
commit 7d99a61
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/emucore/KidVid.cxx b/src/emucore/KidVid.cxx
@@ -241,15 +241,15 @@ bool KidVid::load(Serializer& in)
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 string KidVid::getFileName() const
 {
-  static constexpr std::array<string, 6> fileNames = {
+  static constexpr std::array<string_view, 6> fileNames = {
     "KVS3.WAV", "KVS1.WAV", "KVS2.WAV",
     "KVB3.WAV", "KVB1.WAV", "KVB2.WAV"
   };
 
   int i = myGame == Game::Smurfs ? myTape - 1 : myTape + 2;
   if(myTape == 4) i = 3;
 
-  return fileNames[i];
+  return string{fileNames[i]};
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -