From b3cfed2cb22c582607c167a84442a77464c39483 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 11 Dec 2001 16:00:32 +0000 Subject: [PATCH] Fixed compilation problems under Windows due to changes in using std::ostream etc. --- include/osg/Matrix | 1 + include/osg/Notify | 3 +++ src/osgUtil/SceneView.cpp | 4 ++-- src/osgUtil/TriStripVisitor.cpp | 3 ++- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/include/osg/Matrix b/include/osg/Matrix index 6df3bd94e..f18d3ca01 100644 --- a/include/osg/Matrix +++ b/include/osg/Matrix @@ -14,6 +14,7 @@ #else #include using std::ostream; +using std::endl; #endif // temporary #define to keep backwards compatibility. diff --git a/include/osg/Notify b/include/osg/Notify index 953873d73..4e0cc61b0 100644 --- a/include/osg/Notify +++ b/include/osg/Notify @@ -15,6 +15,9 @@ #include using std::ostream; using std::ofstream; +using std::endl; +using std::cout; +using std::cerr; #endif diff --git a/src/osgUtil/SceneView.cpp b/src/osgUtil/SceneView.cpp index 100801b94..e709d8405 100644 --- a/src/osgUtil/SceneView.cpp +++ b/src/osgUtil/SceneView.cpp @@ -303,7 +303,7 @@ void SceneView::draw() { osg::ref_ptr left_camera = new osg::Camera(*_camera); osg::ref_ptr right_camera = new osg::Camera(*_camera); - float iod = 0.05; + float iod = 0.05f; left_camera->adjustEyeOffsetForStereo(osg::Vec3(-iod*0.5,0.0f,0.0f),_screenDistance); right_camera->adjustEyeOffsetForStereo(osg::Vec3(iod*0.5,0.0f,0.0f),_screenDistance); @@ -323,7 +323,7 @@ void SceneView::draw() { osg::ref_ptr left_camera = new osg::Camera(*_camera); osg::ref_ptr right_camera = new osg::Camera(*_camera); - float iod = 0.05; + float iod = 0.05f; left_camera->adjustEyeOffsetForStereo(osg::Vec3(-iod*0.5,0.0f,0.0f),_screenDistance); right_camera->adjustEyeOffsetForStereo(osg::Vec3(iod*0.5,0.0f,0.0f),_screenDistance); diff --git a/src/osgUtil/TriStripVisitor.cpp b/src/osgUtil/TriStripVisitor.cpp index 252984440..578482880 100644 --- a/src/osgUtil/TriStripVisitor.cpp +++ b/src/osgUtil/TriStripVisitor.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #include @@ -293,7 +294,7 @@ void TriStripVisitor::stripify(GeoSet& gset) } else { - cout << "No triangles to stripify"<