From 3b3ed9efbe321e4df70255609045f87fc44bd1a6 Mon Sep 17 00:00:00 2001 From: Ziemas Date: Sat, 29 Oct 2022 21:25:21 +0200 Subject: [PATCH] Fix GCC build (#1992) Not sure why but using the static members here caused a linker error, but they're only used in one place so I just passed them as constants. --- test/decompiler/FormRegressionTest.cpp | 4 ++-- test/decompiler/FormRegressionTest.h | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/test/decompiler/FormRegressionTest.cpp b/test/decompiler/FormRegressionTest.cpp index 4b5c17d424..447154adfd 100644 --- a/test/decompiler/FormRegressionTest.cpp +++ b/test/decompiler/FormRegressionTest.cpp @@ -21,13 +21,13 @@ using namespace decompiler; void FormRegressionTestJak1::SetUpTestCase() { parser = std::make_unique(); - dts = std::make_unique(game_version); + dts = std::make_unique(GameVersion::Jak1); dts->parse_type_defs({"decompiler", "config", "all-types.gc"}); } void FormRegressionTestJak2::SetUpTestCase() { parser = std::make_unique(); - dts = std::make_unique(game_version); + dts = std::make_unique(GameVersion::Jak2); dts->parse_type_defs({"decompiler", "config", "jak2", "all-types.gc"}); } diff --git a/test/decompiler/FormRegressionTest.h b/test/decompiler/FormRegressionTest.h index 652652dab1..93ff352400 100644 --- a/test/decompiler/FormRegressionTest.h +++ b/test/decompiler/FormRegressionTest.h @@ -100,14 +100,10 @@ class FormRegressionTest : public ::testing::TestWithParam { class FormRegressionTestJak1 : public FormRegressionTest { protected: - static const GameVersion game_version = GameVersion::Jak1; - static void SetUpTestCase(); }; class FormRegressionTestJak2 : public FormRegressionTest { protected: - static const GameVersion game_version = GameVersion::Jak2; - static void SetUpTestCase(); };