Skip to content

Commit

Permalink
Fix missing return of UtlSymTableLargeHashFunctor in utlsymbollarge.h (
Browse files Browse the repository at this point in the history
  • Loading branch information
noahbkim authored Oct 22, 2023
1 parent b645c07 commit 3600b56
Showing 1 changed file with 40 additions and 40 deletions.
80 changes: 40 additions & 40 deletions public/tier1/utlsymbollarge.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//===== Copyright © 1996-2005, Valve Corporation, All rights reserved. ======//
//===== Copyright ? 1996-2005, Valve Corporation, All rights reserved. ======//
//
// Purpose: Defines a large symbol table (intp sized handles, can store more than 64k strings)
//
Expand Down Expand Up @@ -88,39 +88,39 @@ class CUtlSymbolLarge
const char* m_pString;
};

inline uint32 CUtlSymbolLarge_Hash( bool CASEINSENSITIVE, const char *pString, int len )
{
return ( CASEINSENSITIVE ? MurmurHash2LowerCase( pString, len, 0x31415926 ) : MurmurHash2( pString, len, 0x31415926 ) );
inline uint32 CUtlSymbolLarge_Hash( bool CASEINSENSITIVE, const char *pString, int len )
{
return ( CASEINSENSITIVE ? MurmurHash2LowerCase( pString, len, 0x31415926 ) : MurmurHash2( pString, len, 0x31415926 ) );
}

typedef uint32 LargeSymbolTableHashDecoration_t;

// The structure consists of the hash immediately followed by the string data
struct CUtlSymbolTableLargeBaseTreeEntry_t
{
LargeSymbolTableHashDecoration_t m_Hash;
// Variable length string data
char m_String[1];

bool IsEmpty() const
{
return ( ( m_Hash == 0 ) && ( 0 == m_String[0] ) );
}

char const *String() const
{
return (const char *)&m_String[ 0 ];
}

CUtlSymbolLarge ToSymbol() const
{
return CUtlSymbolLarge( String() );
}

LargeSymbolTableHashDecoration_t HashValue() const
{
return m_Hash;
}
typedef uint32 LargeSymbolTableHashDecoration_t;

// The structure consists of the hash immediately followed by the string data
struct CUtlSymbolTableLargeBaseTreeEntry_t
{
LargeSymbolTableHashDecoration_t m_Hash;
// Variable length string data
char m_String[1];

bool IsEmpty() const
{
return ( ( m_Hash == 0 ) && ( 0 == m_String[0] ) );
}

char const *String() const
{
return (const char *)&m_String[ 0 ];
}

CUtlSymbolLarge ToSymbol() const
{
return CUtlSymbolLarge( String() );
}

LargeSymbolTableHashDecoration_t HashValue() const
{
return m_Hash;
}
};

// Base Class for threaded and non-threaded types
Expand Down Expand Up @@ -183,7 +183,7 @@ class CUtlSymbolTableLargeBase
{
CUtlSymbolTableLargeBase* pTable = (CUtlSymbolTableLargeBase*)((uintptr_t)this + m_tableOffset);

pTable->HashValue( k );
return pTable->HashValue( k );
}
};

Expand Down Expand Up @@ -375,13 +375,13 @@ inline void CUtlSymbolTableLargeBase< MutexType, CASEINSENSITIVE >::Purge()
m_Mutex.Unlock( __FILE__, __LINE__ );
}

// Case-sensitive
typedef CUtlSymbolTableLargeBase< CThreadEmptyMutex, false > CUtlSymbolTableLarge;
// Case-insensitive
typedef CUtlSymbolTableLargeBase< CThreadEmptyMutex, true > CUtlSymbolTableLarge_CI;
// Multi-threaded case-sensitive
typedef CUtlSymbolTableLargeBase< CThreadMutex, false > CUtlSymbolTableLargeMT;
// Multi-threaded case-insensitive
// Case-sensitive
typedef CUtlSymbolTableLargeBase< CThreadEmptyMutex, false > CUtlSymbolTableLarge;
// Case-insensitive
typedef CUtlSymbolTableLargeBase< CThreadEmptyMutex, true > CUtlSymbolTableLarge_CI;
// Multi-threaded case-sensitive
typedef CUtlSymbolTableLargeBase< CThreadMutex, false > CUtlSymbolTableLargeMT;
// Multi-threaded case-insensitive
typedef CUtlSymbolTableLargeBase< CThreadMutex, true > CUtlSymbolTableLargeMT_CI;

#endif // UTLSYMBOLLARGE_H

0 comments on commit 3600b56

Please sign in to comment.