Merge branch 'topic/multiplayer' into next

[flightgear.git] / src / GUI / layout-test.cxx

diff --git a/src/GUI/layout-test.cxx b/src/GUI/layout-test.cxx
index bbfa45caf32c9d7d635b1ec89d9830740337a80d..0c7e3fed2a21d953a51d0775f5cdfeab74cd303e 100644 (file)
--- a/src/GUI/layout-test.cxx
+++ b/src/GUI/layout-test.cxx
@@ -5,7 +5,7 @@
 #include <iostream>
 
 #include <simgear/compiler.h>
-#include SG_GL_H
+#include <osg/GL>
 #include <plib/pw.h>
 #include <plib/pu.h>
 #include <simgear/props/props.hxx>
@@ -57,5 +57,5 @@ int main(int argc, char** argv)
     int pw=0, ph=0;
     w.calcPrefSize(&pw, &ph);
     w.layout(0, 0, pw, ph);
-    writeProperties(cout, &props, true);
+    writeProperties(std::cout, &props, true);
 }