From db7110feb137af26f0c98f5b24916ca2c048dfa4 Mon Sep 17 00:00:00 2001 From: "Ben \"root\" Anderson" Date: Mon, 23 Dec 2013 11:06:14 -0600 Subject: [PATCH] Apparently MSVC is convinced that there's an important, linking-breaking difference between classes and structs. (Bug#1093, Thanks root670 for the patch!) --- src/Course.h | 2 +- src/FontManager.h | 2 +- src/GameCommand.h | 2 +- src/GameManager.h | 2 +- src/GameState.h | 2 +- src/InputMapper.h | 2 +- src/NoteSkinManager.h | 2 +- src/Profile.h | 2 +- src/StepMania.h | 2 +- src/Style.h | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Course.h b/src/Course.h index 51bce172c2..de3fb0c04d 100644 --- a/src/Course.h +++ b/src/Course.h @@ -14,7 +14,7 @@ struct lua_State; class Style; -class Game; +struct Game; const int MAX_EDIT_COURSE_TITLE_LENGTH = 16; diff --git a/src/FontManager.h b/src/FontManager.h index 6dbb1a524a..666bfe6c0b 100644 --- a/src/FontManager.h +++ b/src/FontManager.h @@ -4,7 +4,7 @@ #define FONTMANAGER_H class Font; -class Game; +struct Game; class FontManager { diff --git a/src/GameCommand.h b/src/GameCommand.h index 50f9ae5050..d0641292ba 100644 --- a/src/GameCommand.h +++ b/src/GameCommand.h @@ -16,7 +16,7 @@ class Course; class Trail; class Character; class Style; -class Game; +struct Game; struct lua_State; int GetNumCreditsPaid(); diff --git a/src/GameManager.h b/src/GameManager.h index 0fe6ff29ae..1efa2d2015 100644 --- a/src/GameManager.h +++ b/src/GameManager.h @@ -4,7 +4,7 @@ #define GAMEMANAGER_H class Style; -class Game; +struct Game; struct lua_State; #include "GameConstantsAndTypes.h" diff --git a/src/GameState.h b/src/GameState.h index c80056c80b..3f9f390d0b 100644 --- a/src/GameState.h +++ b/src/GameState.h @@ -19,7 +19,7 @@ class Character; class Course; -class Game; +struct Game; struct lua_State; class LuaTable; class PlayerState; diff --git a/src/InputMapper.h b/src/InputMapper.h index 430f0a2015..dfad769167 100644 --- a/src/InputMapper.h +++ b/src/InputMapper.h @@ -4,7 +4,7 @@ #include "RageInputDevice.h" #include "GameInput.h" #include "PlayerNumber.h" -class Game; +struct Game; const int NUM_GAME_TO_DEVICE_SLOTS = 5; // five device inputs may map to one game input const int NUM_SHOWN_GAME_TO_DEVICE_SLOTS = 3; diff --git a/src/NoteSkinManager.h b/src/NoteSkinManager.h index c6594e02bc..c3cd1ef55f 100644 --- a/src/NoteSkinManager.h +++ b/src/NoteSkinManager.h @@ -7,7 +7,7 @@ #include "GameInput.h" #include "IniFile.h" -class Game; +struct Game; struct NoteSkinData; /** @brief Loads note skins. */ diff --git a/src/Profile.h b/src/Profile.h index d86941b14c..640249a7d7 100644 --- a/src/Profile.h +++ b/src/Profile.h @@ -59,7 +59,7 @@ class Style; class Song; class Steps; class Course; -class Game; +struct Game; /** * @brief Player data that persists between sessions. * diff --git a/src/StepMania.h b/src/StepMania.h index a489de6c78..6e121fa636 100644 --- a/src/StepMania.h +++ b/src/StepMania.h @@ -1,7 +1,7 @@ #ifndef STEP_MANIA_H #define STEP_MANIA_H -class Game; +struct Game; class RageTimer; class VideoModeParams; diff --git a/src/Style.h b/src/Style.h index 65c6932cca..78b2457b2b 100644 --- a/src/Style.h +++ b/src/Style.h @@ -14,7 +14,7 @@ const int MAX_COLS_PER_PLAYER = MAX_NOTE_TRACKS; static const int Column_Invalid = -1; class NoteData; -class Game; +struct Game; struct lua_State; class Style