From 1594bbe1d9d20f23ff546475a9f3294ec99c1660 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Tue, 16 Nov 2004 14:35:29 +0000
Subject: [PATCH] Attempted fix for VS6.0 compile problems

---
 examples/osgscalarbar/osgscalarbar.cpp | 43 +++++++++++++++++++-------
 1 file changed, 31 insertions(+), 12 deletions(-)

diff --git a/examples/osgscalarbar/osgscalarbar.cpp b/examples/osgscalarbar/osgscalarbar.cpp
index 80e56937c..8b0ecf76d 100644
--- a/examples/osgscalarbar/osgscalarbar.cpp
+++ b/examples/osgscalarbar/osgscalarbar.cpp
@@ -27,6 +27,37 @@
 using namespace osgSim;
 using osgSim::ScalarBar;
 
+#if defined(_MSC_VER)
+// not have to have this pathway for just VS6.0 as its unable to handle the full
+// ScalarBar::ScalarPrinter::printScalar scoping.
+
+// Create a custom scalar printer
+struct MyScalarPrinter: public ScalarBar::ScalarPrinter
+{
+    std::string printScalar(float scalar)
+    {
+        std::cout<<"In MyScalarPrinter::printScalar"<<std::endl;
+        if(scalar==0.0f) return ScalarPrinter::printScalar(scalar)+" Bottom";
+        else if(scalar==0.5f) return ScalarPrinter::printScalar(scalar)+" Middle";
+        else if(scalar==1.0f) return ScalarPrinter::printScalar(scalar)+" Top";
+        else return ScalarPrinter::printScalar(scalar);
+    }
+};
+#else
+// Create a custom scalar printer
+struct MyScalarPrinter: public ScalarBar::ScalarPrinter
+{
+    std::string printScalar(float scalar)
+    {
+        std::cout<<"In MyScalarPrinter::printScalar"<<std::endl;
+        if(scalar==0.0f) return ScalarBar::ScalarPrinter::printScalar(scalar)+" Bottom";
+        else if(scalar==0.5f) return ScalarBar::ScalarPrinter::printScalar(scalar)+" Middle";
+        else if(scalar==1.0f) return ScalarBar::ScalarPrinter::printScalar(scalar)+" Top";
+        else return ScalarBar::ScalarPrinter::printScalar(scalar);
+    }
+};
+#endif
+
 osg::Node* createScalarBar()
 {
 #if 1
@@ -41,18 +72,6 @@ osg::Node* createScalarBar()
     cs.push_back(osg::Vec4(0.0f,0.0f,1.0f,1.0f));   // B
     cs.push_back(osg::Vec4(0.0f,1.0f,1.0f,1.0f));   // R
 
-    // Create a custom scalar printer
-    struct MyScalarPrinter: public ScalarBar::ScalarPrinter
-    {
-        std::string printScalar(float scalar)
-        {
-            std::cout<<"In MyScalarPrinter::printScalar"<<std::endl;
-            if(scalar==0.0f) return ScalarBar::ScalarPrinter::printScalar(scalar)+" Bottom";
-            else if(scalar==0.5f) return ScalarBar::ScalarPrinter::printScalar(scalar)+" Middle";
-            else if(scalar==1.0f) return ScalarBar::ScalarPrinter::printScalar(scalar)+" Top";
-            else return ScalarBar::ScalarPrinter::printScalar(scalar);
-        }
-    };
 
     ColorRange* cr = new ColorRange(0.0f,1.0f,cs);
     ScalarBar* sb = new ScalarBar(20, 11, cr, "ScalarBar", ScalarBar::VERTICAL, 0.1f, new MyScalarPrinter);