From 1ce53fcfbace92558f08e683578dd68f921fea08 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 24 Jan 2003 09:37:11 +0000 Subject: [PATCH] Changed the setUpViewer so it takes unisigned int to make it easier to do OR'ing of the various enumerates when passing in paramters (avoids a warning). --- include/osgProducer/Viewer | 2 +- src/osgProducer/Viewer.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/osgProducer/Viewer b/include/osgProducer/Viewer index 030bf6ed9..6d93efd36 100644 --- a/include/osgProducer/Viewer +++ b/include/osgProducer/Viewer @@ -56,7 +56,7 @@ class OSGPRODUCER_EXPORT Viewer : public CameraGroup, public osgGA::GUIActionAda HEAD_LIGHT_SOURCE }; - void setUpViewer(ViewerOptions options=STANDARD_SETTINGS); + void setUpViewer(unsigned int options=STANDARD_SETTINGS); bool done() const { return _done; } diff --git a/src/osgProducer/Viewer.cpp b/src/osgProducer/Viewer.cpp index dd7da4979..a5aea169d 100644 --- a/src/osgProducer/Viewer.cpp +++ b/src/osgProducer/Viewer.cpp @@ -34,7 +34,7 @@ Viewer::Viewer(const std::string& configFile): { } -void Viewer::setUpViewer(Viewer::ViewerOptions options) +void Viewer::setUpViewer(unsigned int options) { // set up the keyboard and mouse handling.