From 29c0e913d7d0a5ea32054338733148275e1b2959 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 8 Oct 2008 10:10:34 +0000 Subject: [PATCH] From Mathias Froehlich, fixes for HP-UX, SGI and Solaris build --- include/osgWidget/Util | 2 +- src/osgViewer/StatsHandler.cpp | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/osgWidget/Util b/include/osgWidget/Util index ae1018c8b..bb82c8534 100644 --- a/include/osgWidget/Util +++ b/include/osgWidget/Util @@ -17,7 +17,7 @@ #ifndef OSGWIDGET_UTIL #define OSGWIDGET_UTIL -#include +#include #include #include #include diff --git a/src/osgViewer/StatsHandler.cpp b/src/osgViewer/StatsHandler.cpp index 056296a14..640d9cca3 100644 --- a/src/osgViewer/StatsHandler.cpp +++ b/src/osgViewer/StatsHandler.cpp @@ -324,16 +324,16 @@ struct CameraSceneStatsTextDrawCallback : public virtual osg::Drawable::DrawCall _cameraNumber(cameraNumber) { - _primitiveModeStreamMap.insert(std::make_pair(osg::PrimitiveSet::POINTS, &stream[0])); - _primitiveModeStreamMap.insert(std::make_pair(osg::PrimitiveSet::LINES, &stream[1])); - _primitiveModeStreamMap.insert(std::make_pair(osg::PrimitiveSet::LINE_STRIP, &stream[2])); - _primitiveModeStreamMap.insert(std::make_pair(osg::PrimitiveSet::LINE_LOOP, &stream[3])); - _primitiveModeStreamMap.insert(std::make_pair(osg::PrimitiveSet::TRIANGLES, &stream[4])); - _primitiveModeStreamMap.insert(std::make_pair(osg::PrimitiveSet::TRIANGLE_STRIP, &stream[5])); - _primitiveModeStreamMap.insert(std::make_pair(osg::PrimitiveSet::TRIANGLE_FAN, &stream[6])); - _primitiveModeStreamMap.insert(std::make_pair(osg::PrimitiveSet::QUADS, &stream[7])); - _primitiveModeStreamMap.insert(std::make_pair(osg::PrimitiveSet::QUAD_STRIP, &stream[8])); - _primitiveModeStreamMap.insert(std::make_pair(osg::PrimitiveSet::POLYGON, &stream[9])); + _primitiveModeStreamMap[osg::PrimitiveSet::POINTS] = &stream[0]; + _primitiveModeStreamMap[osg::PrimitiveSet::LINES] = &stream[1]; + _primitiveModeStreamMap[osg::PrimitiveSet::LINE_STRIP] = &stream[2]; + _primitiveModeStreamMap[osg::PrimitiveSet::LINE_LOOP] = &stream[3]; + _primitiveModeStreamMap[osg::PrimitiveSet::TRIANGLES] = &stream[4]; + _primitiveModeStreamMap[osg::PrimitiveSet::TRIANGLE_STRIP] = &stream[5]; + _primitiveModeStreamMap[osg::PrimitiveSet::TRIANGLE_FAN] = &stream[6]; + _primitiveModeStreamMap[osg::PrimitiveSet::QUADS] = &stream[7]; + _primitiveModeStreamMap[osg::PrimitiveSet::QUAD_STRIP] = &stream[8]; + _primitiveModeStreamMap[osg::PrimitiveSet::POLYGON] = &stream[9]; } /** do customized draw code.*/