Skip to content

first try at fixing macos build #436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

first try at fixing macos build #436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion public/datamodel/dmattributevar.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1152,7 +1152,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 this->Get().m_ElementType;
}

template <class T>
Expand Down
10 changes: 6 additions & 4 deletions public/tier1/utlblockmemory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,13 +134,15 @@ CUtlBlockMemory<T,I>::~CUtlBlockMemory()
//-----------------------------------------------------------------------------
// Fast swap
//-----------------------------------------------------------------------------
#include <utility>

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 );
std::swap( m_pMemory, mem.m_pMemory );
std::swap( m_nBlocks, mem.m_nBlocks );
std::swap( m_nIndexMask, mem.m_nIndexMask );
std::swap( m_nIndexShift, mem.m_nIndexShift );
}


Expand Down