Merge branch 'next' of git.gitorious.org:fg/simgear into next

2011-09-09 18:13:12 +02:00 · 2011-09-09 18:13:12 +02:00 · b204b3c8eb
commit b204b3c8eb
parent 34738bb20a 7c7f3d4fcd
2 changed files with 7 additions and 0 deletions
--- a/simgear/props/propertyObject_test.cxx
+++ b/simgear/props/propertyObject_test.cxx
@ -5,6 +5,9 @@
 #include <cassert>
 #include <cstring>

+// working around MSVC weirdness with props.hxx and SGMathFwd
+#include <simgear/math/SGMath.hxx>
+
 #include "propertyObject.hxx"

 #include <simgear/structure/exception.hxx>
--- a/simgear/props/props_test.cxx
+++ b/simgear/props/props_test.cxx
@ -6,6 +6,10 @@
 #include <simgear/compiler.h>

 #include <iostream>
+
+// working around MSVC weirdness with props.hxx and SGMathFwd
+#include <simgear/math/SGMath.hxx>
+
 #include "props.hxx"
 #include "props_io.hxx"