Skip to content

Commit

Permalink
clang: Fix build with LLVM 19
Browse files Browse the repository at this point in the history
  • Loading branch information
er2off committed Oct 21, 2024
1 parent 2998568 commit 0df94c6
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 28 deletions.
6 changes: 3 additions & 3 deletions datamodel/datamodel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ InitReturnVal_t CDataModel::Init( )
//#define _ELEMENT_HISTOGRAM_
#ifdef _ELEMENT_HISTOGRAM_
CUtlMap< UtlSymId_t, int > g_typeHistogram( 0, 100, DefLessFunc( UtlSymId_t ) );
#endif _ELEMENT_HISTOGRAM_
#endif


//-----------------------------------------------------------------------------
Expand All @@ -166,7 +166,7 @@ void CDataModel::Shutdown()
Msg( "%d\t%s\n", g_typeHistogram.Element( i ), GetString( g_typeHistogram.Key( i ) ) );
}
Msg( "\n" );
#endif _ELEMENT_HISTOGRAM_
#endif

int c = GetAllocatedElementCount();
if ( c > 0 )
Expand Down Expand Up @@ -1934,7 +1934,7 @@ CDmElement* CDataModel::CreateElement( const DmElementReference_t &ref, const ch
{
g_typeHistogram.Insert( typeSym, 1 );
}
#endif _ELEMENT_HISTOGRAM_
#endif
}

return pElement;
Expand Down
11 changes: 7 additions & 4 deletions public/datamodel/dmattributevar.h
Original file line number Diff line number Diff line change
Expand Up @@ -368,8 +368,9 @@ class CDmaDataInternal

const T& Value() const { return m_Storage; }
T& Value( ) { return m_Storage; }
const D& Data() const { return m_Storage; }
D& Data( ) { return m_Storage; }
public:
const D& Data() const { return m_Storage; }

private:
D m_Storage;
Expand All @@ -385,8 +386,9 @@ class CDmaDataExternal
void Attach( void *pData ) { m_pStorage = (D*)pData; }
const T& Value() const { return *m_pStorage; }
T& Value( ) { return *m_pStorage; }
const D& Data() const { return *m_pStorage; }
D& Data( ) { return *m_pStorage; }
public:
const D& Data() const { return *m_pStorage; }

private:
D* m_pStorage;
Expand Down Expand Up @@ -1152,7 +1154,7 @@ inline void CDmaElement<T>::Init( CDmElement *pOwner, const char *pAttributeName
template <class T>
inline UtlSymId_t CDmaElement<T>::GetElementType() const
{
return this->Data().m_ElementType;
return static_cast<CDmaDataInternal<const T>*>(this)->Data().m_ElementType;
}

template <class T>
Expand Down Expand Up @@ -1350,7 +1352,8 @@ inline int CDmaStringArrayBase<B>::InsertBefore( int elem, const char *pValue )
template< class E, class B >
inline UtlSymId_t CDmaElementArrayConstBase<E,B>::GetElementType() const
{
return this->Data().m_ElementType;
// Fuck MSVC, anyway I'm unsure about if this code was called
return static_cast<const B*>(this)->Data().m_ElementType;
}

template< class E, class B >
Expand Down
8 changes: 4 additions & 4 deletions public/tier1/utlblockmemory.h
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,10 @@ CUtlBlockMemory<T,I>::~CUtlBlockMemory()
template< class T, class I >
void CUtlBlockMemory<T,I>::Swap( CUtlBlockMemory< T, I > &mem )
{
this->swap( m_pMemory, mem.m_pMemory );
this->swap( m_nBlocks, mem.m_nBlocks );
this->swap( m_nIndexMask, mem.m_nIndexMask );
this->swap( m_nIndexShift, mem.m_nIndexShift );
Swap( m_pMemory, mem.m_pMemory );
Swap( m_nBlocks, mem.m_nBlocks );
Swap( m_nIndexMask, mem.m_nIndexMask );
Swap( m_nIndexShift, mem.m_nIndexShift );
}


Expand Down
4 changes: 2 additions & 2 deletions public/tier3/tier3dm.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class CTier3DmAppSystem : public CTier2DmAppSystem< IInterface, ConVarFlag >
if ( !BaseClass::Connect( factory ) )
return false;

if ( IsPrimaryAppSystem() )
if ( this->IsPrimaryAppSystem() )
{
ConnectTier3Libraries( &factory, 1 );
}
Expand All @@ -42,7 +42,7 @@ class CTier3DmAppSystem : public CTier2DmAppSystem< IInterface, ConVarFlag >

virtual void Disconnect()
{
if ( IsPrimaryAppSystem() )
if ( this->IsPrimaryAppSystem() )
{
DisconnectTier3Libraries();
}
Expand Down
19 changes: 8 additions & 11 deletions tier0/threadtools.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,23 +26,20 @@
#include <sys/time.h>
#define GetLastError() errno
typedef void *LPVOID;
#if !defined(OSX)
#include <fcntl.h>
#include <unistd.h>
#define sem_unlink( arg )
#define OS_TO_PTHREAD(x) (x)
#else
#if defined(OSX)
#define pthread_yield pthread_yield_np
#include <mach/thread_act.h>
#include <mach/mach.h>
#define OS_TO_PTHREAD(x) pthread_from_mach_thread_np( x )
#elif defined(PLATFORM_BSD)
#define OS_TO_PTHREAD(x) (pthread_t)(x)
#else
#include <fcntl.h>
#include <unistd.h>
#define sem_unlink( arg )
#define OS_TO_PTHREAD(x) (x)
#endif // !OSX

#ifdef PLATFORM_BSD
# undef OS_TO_PTRHEAD
# define OS_TO_PTHREAD(x) (pthread_t)(x)
#endif

#endif

#ifndef _PS3
Expand Down
1 change: 1 addition & 0 deletions tier0/wscript
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ def configure(conf):
conf.define('WAF_CFLAGS', conf.env.CFLAGS)
conf.define('WAF_LDFLAGS', conf.env.LINKFLAGS)
conf.define('TIER0_DLL_EXPORT',1)
conf.define('GIT_COMMIT_HASH', conf.env.GIT_VERSION)
# conf.define('NO_HOOK_MALLOC',1)

def build(bld):
Expand Down
5 changes: 1 addition & 4 deletions wscript
Original file line number Diff line number Diff line change
Expand Up @@ -279,9 +279,6 @@ def define_platform(conf):
'NDEBUG'
])

conf.define('GIT_COMMIT_HASH', conf.env.GIT_VERSION)


def options(opt):
grp = opt.add_option_group('Common options')

Expand Down Expand Up @@ -518,7 +515,7 @@ def configure(conf):
]

flags += ['-funwind-tables', '-g']
elif conf.env.COMPILER_CC != 'msvc' and conf.env.DEST_OS != 'darwin' and conf.env.DEST_CPU in ['x86', 'x86_64']:
elif conf.env.COMPILER_CC != 'msvc' and conf.env.DEST_OS not in ['darwin', 'freebsd'] and conf.env.DEST_CPU in ['x86', 'x86_64']:
flags += ['-march=core2']

if conf.env.DEST_CPU in ['x86', 'x86_64']:
Expand Down

0 comments on commit 0df94c6

Please sign in to comment.