From 1432d4d54b95de6ffbea43d767302cbf2761754e Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Tue, 7 Feb 2012 16:14:13 +0000
Subject: [PATCH] Fixed build issues when compile with
 OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION set to OFF.

---
 src/osg/UserDataContainer.cpp | 2 +-
 src/osgDB/Registry.cpp        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/osg/UserDataContainer.cpp b/src/osg/UserDataContainer.cpp
index c04e449ac..0d4293697 100644
--- a/src/osg/UserDataContainer.cpp
+++ b/src/osg/UserDataContainer.cpp
@@ -56,7 +56,7 @@ DefaultUserDataContainer::DefaultUserDataContainer(const DefaultUserDataContaine
         itr != udc._objectList.end();
         ++itr)
     {
-        _objectList.push_back(copyop(*itr));
+        _objectList.push_back(copyop(itr->get()));
     }
 }
 
diff --git a/src/osgDB/Registry.cpp b/src/osgDB/Registry.cpp
index cd73db561..ba3762250 100644
--- a/src/osgDB/Registry.cpp
+++ b/src/osgDB/Registry.cpp
@@ -1100,7 +1100,7 @@ ReaderWriter::ReadResult Registry::read(const ReadFunctor& readFunctor)
 
             options->setDatabasePath(archiveName);
 
-            std::auto_ptr<ReadFunctor> rf(readFunctor.cloneType(fileName, options));
+            std::auto_ptr<ReadFunctor> rf(readFunctor.cloneType(fileName, options.get()));
             
             result = rf->doRead(*archive);