diff options
| author | Alan Edwardes <[email protected]> | 2013-12-03 10:47:30 +0000 |
|---|---|---|
| committer | Alan Edwardes <[email protected]> | 2013-12-03 10:47:30 +0000 |
| commit | 550992aebacbc7586553c15a3c2120f85a879126 (patch) | |
| tree | c814cf654018acd5d69bb6e4be5dc9900391fd37 /sp/src/public/vallocator.cpp | |
| parent | VBSP now checks all search paths for an FGD file. (diff) | |
| parent | Make .xcconfigs text files too. (diff) | |
| download | source-sdk-2013-550992aebacbc7586553c15a3c2120f85a879126.tar.xz source-sdk-2013-550992aebacbc7586553c15a3c2120f85a879126.zip | |
Merge remote-tracking branch 'upstream/master' into vbsp-fixes.
Diffstat (limited to 'sp/src/public/vallocator.cpp')
| -rw-r--r-- | sp/src/public/vallocator.cpp | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/sp/src/public/vallocator.cpp b/sp/src/public/vallocator.cpp index f19fe57a..be717033 100644 --- a/sp/src/public/vallocator.cpp +++ b/sp/src/public/vallocator.cpp @@ -1,36 +1,36 @@ -//========= Copyright Valve Corporation, All rights reserved. ============//
-//
-// Purpose:
-//
-// $NoKeywords: $
-//
-//=============================================================================//
-
-#if !defined(_STATIC_LINKED) || defined(_SHARED_LIB)
-
-#include <malloc.h>
-#include "vallocator.h"
-#include "basetypes.h"
-
-// memdbgon must be the last include file in a .cpp file!!!
-#include "tier0/memdbgon.h"
-
-VStdAllocator g_StdAllocator;
-
-void* VStdAllocator::Alloc(unsigned long size)
-{
- if(size)
- {
- void *ret = malloc(size);
- return ret;
- }
- else
- return 0;
-}
-
-void VStdAllocator::Free(void *ptr)
-{
- free(ptr);
-}
-
-#endif // !_STATIC_LINKED || _SHARED_LIB
+//========= Copyright Valve Corporation, All rights reserved. ============// +// +// Purpose: +// +// $NoKeywords: $ +// +//=============================================================================// + +#if !defined(_STATIC_LINKED) || defined(_SHARED_LIB) + +#include <malloc.h> +#include "vallocator.h" +#include "basetypes.h" + +// memdbgon must be the last include file in a .cpp file!!! +#include "tier0/memdbgon.h" + +VStdAllocator g_StdAllocator; + +void* VStdAllocator::Alloc(unsigned long size) +{ + if(size) + { + void *ret = malloc(size); + return ret; + } + else + return 0; +} + +void VStdAllocator::Free(void *ptr) +{ + free(ptr); +} + +#endif // !_STATIC_LINKED || _SHARED_LIB |