FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes for Windows build.

Browse Source
This commit is contained in:
Robert Osfield
2002-01-30 16:24:24 +00:00
parent 4d43f83295
commit 1aaa46dbe7
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
VisualStudio/VisualStudio.dsw
View File

@@ -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>
{{{

2
include/osg/Image
View File

@@ -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;

9
include/osg/ref_ptr
View File

@@ -69,9 +69,14 @@ class ref_ptr
return (_ptr<rp._ptr);
}
inline const bool operator < (const T* ptr) const
inline const bool operator > (const ref_ptr& rp) const
{
return (_ptr<ptr);
return (_ptr>rp._ptr);
}
inline const bool operator > (const T* ptr) const
{
return (_ptr>ptr);
}
inline T& operator*() { return *_ptr; }