Warning disable for MSVC bug

jaj22 · Nov 25, 2011 · a7783c5 · a7783c5
1 parent 6006b4a
commit a7783c5
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/terrain/Terrain.h b/src/terrain/Terrain.h
@@ -4,6 +4,8 @@
 #include "libs.h"
 #include "StarSystem.h"
 
+#pragma warning(disable : 4250)			// workaround for MSVC 2008 multiple inheritance bug
+
 struct fracdef_t {
 	fracdef_t() : amplitude(0.0), frequency(0.0), lacunarity(0.0), octaves(0) {}
 	double amplitude;
@@ -171,4 +173,6 @@ class TerrainColorTFGood;
 class TerrainColorTFPoor;
 class TerrainColorVolcanic;
 
+#pragma warning(default : 4250)
+
 #endif /* TERRAIN_H */