From ff8c6aa32b3f60724edaa1925b84fb3ea9d63501 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Tue, 7 Oct 2008 12:31:42 +0000
Subject: [PATCH] From Mathias Froehlich, build fixes

---
 include/osgShadow/MinimalShadowMap   | 2 +-
 src/osgDB/DatabasePager.cpp          | 2 +-
 src/osgPlugins/osga/OSGA_Archive.cpp | 2 +-
 src/osgSim/LightPointNode.cpp        | 2 +-
 src/osgVolume/ImageUtils.cpp         | 1 +
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/include/osgShadow/MinimalShadowMap b/include/osgShadow/MinimalShadowMap
index ef529e0a4..d5384ec97 100644
--- a/include/osgShadow/MinimalShadowMap
+++ b/include/osgShadow/MinimalShadowMap
@@ -62,7 +62,7 @@ class OSGSHADOW_EXPORT MinimalShadowMap : public StandardShadowMap
             EMPTY_BOX,
             BOUNDING_SPHERE,
             BOUNDING_BOX,
-            DEFAULT_ACCURACY = BOUNDING_BOX,
+            DEFAULT_ACCURACY = BOUNDING_BOX
         };
 
         void  setShadowReceivingCoarseBoundAccuracy
diff --git a/src/osgDB/DatabasePager.cpp b/src/osgDB/DatabasePager.cpp
index 3415041cb..5953ea62a 100644
--- a/src/osgDB/DatabasePager.cpp
+++ b/src/osgDB/DatabasePager.cpp
@@ -1630,7 +1630,7 @@ void DatabasePager::compileGLObjects(osg::State& state, double& availableTime)
             OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_dataToCompileList->_requestMutex);
         
             // advance to the next entry to compile if one is available.
-            databaseRequest = _dataToCompileList->_requestList.empty() ? 0 : _dataToCompileList->_requestList.front();
+            databaseRequest = _dataToCompileList->_requestList.empty() ? 0 : _dataToCompileList->_requestList.front().get();
         };
 
         unsigned int numObjectsCompiled = 0;
diff --git a/src/osgPlugins/osga/OSGA_Archive.cpp b/src/osgPlugins/osga/OSGA_Archive.cpp
index 84a47c848..ca86b79ad 100644
--- a/src/osgPlugins/osga/OSGA_Archive.cpp
+++ b/src/osgPlugins/osga/OSGA_Archive.cpp
@@ -561,7 +561,7 @@ bool OSGA_Archive::addFileReference(pos_type position, size_type size, const std
 
     // get an IndexBlock with space available if possible
     unsigned int blockSize = 4096;
-    osg::ref_ptr<IndexBlock> indexBlock = _indexBlockList.empty() ? 0 : _indexBlockList.back();
+    osg::ref_ptr<IndexBlock> indexBlock = _indexBlockList.empty() ? 0 : _indexBlockList.back().get();
     osg::ref_ptr<IndexBlock> previousBlock = indexBlock;
     if (indexBlock.valid())
     {
diff --git a/src/osgSim/LightPointNode.cpp b/src/osgSim/LightPointNode.cpp
index ac6553a1e..4089b3906 100644
--- a/src/osgSim/LightPointNode.cpp
+++ b/src/osgSim/LightPointNode.cpp
@@ -204,7 +204,7 @@ void LightPointNode::traverse(osg::NodeVisitor& nv)
         // as this will be our special light point drawable.
         osgUtil::StateGraph::LeafList::iterator litr;
         for(litr = rg->_leaves.begin();
-            litr != rg->_leaves.end() && (*litr)->_drawable!=drawable;
+            litr != rg->_leaves.end() && (*litr)->_drawable.get()!=drawable;
             ++litr)
         {}
         
diff --git a/src/osgVolume/ImageUtils.cpp b/src/osgVolume/ImageUtils.cpp
index d4774b5d6..2a67a937b 100644
--- a/src/osgVolume/ImageUtils.cpp
+++ b/src/osgVolume/ImageUtils.cpp
@@ -12,6 +12,7 @@
 */
 
 #include <float.h>
+#include <string.h>
 #include <osg/Math>
 #include <osg/Notify>
 #include <osgVolume/ImageUtils>