drewcassidy/nvidia-texture-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge fixes from trunk.

Browse Source
This commit is contained in:
castano 2008-10-22 05:31:53 +00:00
parent 3f13eb89f1
commit 73288eb24b
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/nvcore/Ptr.h
View File

@ -43,8 +43,11 @@ public:
/** Delete owned pointer and assign new one. */ /** Delete owned pointer and assign new one. */
void operator=( T * p ) { void operator=( T * p ) {
delete m_ptr; if (p != m_ptr)
m_ptr = p; {
delete m_ptr;
m_ptr = p;
}
} }
/** Member access. */ /** Member access. */
@ -249,14 +252,14 @@ public:
/** -> operator. */ /** -> operator. */
BaseClass * operator -> () const BaseClass * operator -> () const
{ {
piCheck( m_ptr != NULL ); nvCheck( m_ptr != NULL );
return m_ptr; return m_ptr;
} }
/** * operator. */ /** * operator. */
BaseClass & operator*() const BaseClass & operator*() const
{ {
piCheck( m_ptr != NULL ); nvCheck( m_ptr != NULL );
return *m_ptr; return *m_ptr;
} }