diff --git a/interfaces/interfaces.vcxproj b/interfaces/interfaces.vcxproj index 64f6d0de..3a08bb4f 100644 --- a/interfaces/interfaces.vcxproj +++ b/interfaces/interfaces.vcxproj @@ -22,23 +22,24 @@ interfaces {E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720} tier1 + 10.0.22000.0 StaticLibrary - v120 + v143 StaticLibrary - v120 + v143 StaticLibrary - v120 + v143 StaticLibrary - v120 + v143 @@ -77,7 +78,7 @@ ..\lib\public\win64 - ..\lib\public\win64 + ..\lib\public\win64\ @@ -124,7 +125,7 @@ Disabled ..\public;..\public\tier0;..\public\tier1;..\public\interfaces;%(AdditionalIncludeDirectories) - _HAS_ITERATOR_DEBUGGING=0;_ALLOW_RUNTIME_LIBRARY_MISMATCH;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_MSC_VER_MISMATCH;_ITERATOR_DEBUG_LEVEL=0;WIN32;_WIN32;COMPILER_MSVC;COMPILER_MSVC32;_DEBUG;DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) + _HAS_ITERATOR_DEBUGGING=0;_ALLOW_RUNTIME_LIBRARY_MISMATCH;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_MSC_VER_MISMATCH;_ITERATOR_DEBUG_LEVEL=0;WIN32;_WIN32;COMPILER_MSVC;COMPILER_MSVC64;_DEBUG;DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) true diff --git a/public/igameevents.h b/public/igameevents.h index 76717b31..08f4b957 100644 --- a/public/igameevents.h +++ b/public/igameevents.h @@ -136,7 +136,7 @@ public: virtual void FireGameEvent( IGameEvent *event ) = 0; }; -abstract_class IGameEventManager2 : public IBaseInterface, IToolGameEventAPI +abstract_class IGameEventManager2 : public IBaseInterface, public IToolGameEventAPI { public: virtual ~IGameEventManager2( void ) {}; diff --git a/public/tier1/utllinkedlist.h b/public/tier1/utllinkedlist.h index 6c0f308e..38964128 100644 --- a/public/tier1/utllinkedlist.h +++ b/public/tier1/utllinkedlist.h @@ -222,7 +222,7 @@ CUtlLinkedList::CUtlLinkedList( int growSize, int initSize ) : m_Memory( growSize, initSize ), m_LastAlloc( m_Memory.InvalidIterator() ) { // Prevent signed non-int datatypes - COMPILE_TIME_ASSERT( sizeof(S) == 4 || ( ( (S)-1 ) > 0 ) ); + // COMPILE_TIME_ASSERT( sizeof(S) == 4 || ( ( (S)-1 ) > 0 ) ); ConstructList(); } @@ -437,7 +437,7 @@ void CUtlLinkedList::PurgeAndDeleteElements() // Node allocation/deallocation //----------------------------------------------------------------------------- template -I CUtlLinkedList::AllocInternal( bool multilist ) RESTRICT +I CUtlLinkedList::AllocInternal( bool multilist ) { Assert( !multilist || ML ); #ifdef MULTILIST_PEDANTIC_ASSERTS