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:28 +00:00
parent ad43f6e5f2
commit 3f13eb89f1
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/nvcore/StrLib.h
View File

@ -14,7 +14,7 @@ namespace nv
uint strHash(const char * str, uint h) NV_PURE; uint strHash(const char * str, uint h) NV_PURE;
/// String hash vased on Bernstein's hash. /// String hash based on Bernstein's hash.
inline uint strHash(const char * data, uint h = 5381) inline uint strHash(const char * data, uint h = 5381)
{ {
uint i; uint i;
@ -212,10 +212,13 @@ namespace nv
/// Implement value semantics. /// Implement value semantics.
String & operator=( const String & str ) String & operator=( const String & str )
{
if (str.data != data)
{ {
release(); release();
data = str.data; data = str.data;
addRef(); addRef();
}
return *this; return *this;
} }