From 1aaa46dbe7519f9222003d018f13aa7fb74700c1 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 30 Jan 2002 16:24:24 +0000 Subject: [PATCH] Fixes for Windows build. --- VisualStudio/VisualStudio.dsw | 2 +- include/osg/Image | 2 +- include/osg/ref_ptr | 9 +++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/VisualStudio/VisualStudio.dsw b/VisualStudio/VisualStudio.dsw index 40c4baf88..99f64c344 100644 --- a/VisualStudio/VisualStudio.dsw +++ b/VisualStudio/VisualStudio.dsw @@ -564,7 +564,7 @@ Package=<4> ############################################################################### -Project: "osgbillboard"=".\Demos\osgbilloard\osgbillboard.dsp" - Package Owner=<4> +Project: "osgbillboard"=".\Demos\osgbillboard\osgbillboard.dsp" - Package Owner=<4> Package=<5> {{{ diff --git a/include/osg/Image b/include/osg/Image index 022fcf6fb..69be76f87 100644 --- a/include/osg/Image +++ b/include/osg/Image @@ -86,7 +86,7 @@ class SG_EXPORT Image : public Object virtual ~Image(); - Image& operator = (const Image& image) {} + Image& operator = (const Image&) { return *this; } std::string _fileName; int _s, _t, _r; diff --git a/include/osg/ref_ptr b/include/osg/ref_ptr index e64d87295..9192eb799 100644 --- a/include/osg/ref_ptr +++ b/include/osg/ref_ptr @@ -69,9 +69,14 @@ class ref_ptr return (_ptr (const ref_ptr& rp) const { - return (_ptrrp._ptr); + } + + inline const bool operator > (const T* ptr) const + { + return (_ptr>ptr); } inline T& operator*() { return *_ptr; }