mirror of
https://github.com/alliedmodders/hl2sdk.git
synced 2025-01-11 19:22:19 +08:00
Rename byteswap to cbyteswap (#140)
Resolves include collision with protobuf dependency
This commit is contained in:
parent
f6fe5165fc
commit
05a5907e05
@ -1,4 +1,4 @@
|
|||||||
//========= Copyright © 1996-2005, Valve Corporation, All rights reserved. ============//
|
//========= Copyright <EFBFBD> 1996-2005, Valve Corporation, All rights reserved. ============//
|
||||||
//
|
//
|
||||||
// Purpose: Swap a compiled caption file.
|
// Purpose: Swap a compiled caption file.
|
||||||
//
|
//
|
||||||
@ -6,7 +6,7 @@
|
|||||||
//=============================================================================//
|
//=============================================================================//
|
||||||
|
|
||||||
#include "utlbuffer.h"
|
#include "utlbuffer.h"
|
||||||
#include "byteswap.h"
|
#include "cbyteswap.h"
|
||||||
#include "filesystem.h"
|
#include "filesystem.h"
|
||||||
#include "tier2/fileutils.h"
|
#include "tier2/fileutils.h"
|
||||||
#include "captioncompiler.h"
|
#include "captioncompiler.h"
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
//========= Copyright © 1996-2006, Valve LLC, All rights reserved. ============
|
//========= Copyright <EFBFBD> 1996-2006, Valve LLC, All rights reserved. ============
|
||||||
//
|
//
|
||||||
// Purpose: StudioMDL byteswapping functions.
|
// Purpose: StudioMDL byteswapping functions.
|
||||||
//
|
//
|
||||||
@ -11,7 +11,7 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "byteswap.h"
|
#include "cbyteswap.h"
|
||||||
struct studiohdr_t;
|
struct studiohdr_t;
|
||||||
class IPhysicsCollision;
|
class IPhysicsCollision;
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
//========= Copyright © 1996-2005, Valve Corporation, All rights reserved. ============//
|
//========= Copyright <EFBFBD> 1996-2005, Valve Corporation, All rights reserved. ============//
|
||||||
//
|
//
|
||||||
// Purpose:
|
// Purpose:
|
||||||
//
|
//
|
||||||
@ -27,7 +27,7 @@
|
|||||||
#include <game/client/iviewport.h>
|
#include <game/client/iviewport.h>
|
||||||
#include <stdlib.h> // MAX_PATH define
|
#include <stdlib.h> // MAX_PATH define
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include "byteswap.h"
|
#include "cbyteswap.h"
|
||||||
#include "vgui_int.h"
|
#include "vgui_int.h"
|
||||||
|
|
||||||
// memdbgon must be the last include file in a .cpp file!!!
|
// memdbgon must be the last include file in a .cpp file!!!
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
//========= Copyright © 1996-2005, Valve Corporation, All rights reserved. ============//
|
//========= Copyright <EFBFBD> 1996-2005, Valve Corporation, All rights reserved. ============//
|
||||||
//
|
//
|
||||||
// Purpose:
|
// Purpose:
|
||||||
//
|
//
|
||||||
@ -22,7 +22,7 @@
|
|||||||
#include "sceneentity.h"
|
#include "sceneentity.h"
|
||||||
#include "ai_baseactor.h"
|
#include "ai_baseactor.h"
|
||||||
#include "datacache/imdlcache.h"
|
#include "datacache/imdlcache.h"
|
||||||
#include "tier1/byteswap.h"
|
#include "tier1/cbyteswap.h"
|
||||||
#include "toolframework/itoolframework.h"
|
#include "toolframework/itoolframework.h"
|
||||||
#include "flexcycler.h"
|
#include "flexcycler.h"
|
||||||
|
|
||||||
|
@ -233,7 +233,7 @@
|
|||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClInclude Include="..\public\tier1\bitbuf.h" />
|
<ClInclude Include="..\public\tier1\bitbuf.h" />
|
||||||
<ClInclude Include="..\public\tier1\byteswap.h" />
|
<ClInclude Include="..\public\tier1\cbyteswap.h" />
|
||||||
<ClInclude Include="..\public\tier1\callqueue.h" />
|
<ClInclude Include="..\public\tier1\callqueue.h" />
|
||||||
<ClInclude Include="..\public\tier1\characterset.h" />
|
<ClInclude Include="..\public\tier1\characterset.h" />
|
||||||
<ClInclude Include="..\public\tier1\checksum_crc.h" />
|
<ClInclude Include="..\public\tier1\checksum_crc.h" />
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
<ClInclude Include="..\public\tier1\bitbuf.h">
|
<ClInclude Include="..\public\tier1\bitbuf.h">
|
||||||
<Filter>Header Files</Filter>
|
<Filter>Header Files</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
<ClInclude Include="..\public\tier1\byteswap.h">
|
<ClInclude Include="..\public\tier1\cbyteswap.h">
|
||||||
<Filter>Header Files</Filter>
|
<Filter>Header Files</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
<ClInclude Include="..\public\tier1\callqueue.h">
|
<ClInclude Include="..\public\tier1\callqueue.h">
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
//====== Copyright © 1996-2005, Valve Corporation, All rights reserved. =======//
|
//====== Copyright <EFBFBD> 1996-2005, Valve Corporation, All rights reserved. =======//
|
||||||
//
|
//
|
||||||
// Purpose:
|
// Purpose:
|
||||||
//
|
//
|
||||||
@ -17,7 +17,7 @@
|
|||||||
#include "unitlib/unitlib.h" // just here for tests - remove before checking in!!!
|
#include "unitlib/unitlib.h" // just here for tests - remove before checking in!!!
|
||||||
|
|
||||||
#include "tier1/utlmemory.h"
|
#include "tier1/utlmemory.h"
|
||||||
#include "tier1/byteswap.h"
|
#include "tier1/cbyteswap.h"
|
||||||
#include "tier1/bufferstring.h"
|
#include "tier1/bufferstring.h"
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
#include "zip_utils.h"
|
#include "zip_utils.h"
|
||||||
#include "zip_uncompressed.h"
|
#include "zip_uncompressed.h"
|
||||||
#include "checksum_crc.h"
|
#include "checksum_crc.h"
|
||||||
#include "byteswap.h"
|
#include "cbyteswap.h"
|
||||||
#include "utlstring.h"
|
#include "utlstring.h"
|
||||||
|
|
||||||
// NOTE: This has to be the last file included!
|
// NOTE: This has to be the last file included!
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
//========= Copyright © 1996-2006, Valve LLC, All rights reserved. ============
|
//========= Copyright <EFBFBD> 1996-2006, Valve LLC, All rights reserved. ============
|
||||||
//
|
//
|
||||||
// Purpose: Low level byte swapping routines.
|
// Purpose: Low level byte swapping routines.
|
||||||
//
|
//
|
||||||
// $NoKeywords: $
|
// $NoKeywords: $
|
||||||
//=============================================================================
|
//=============================================================================
|
||||||
|
|
||||||
#include "byteswap.h"
|
#include "cbyteswap.h"
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
// Copy a single field from the input buffer to the output buffer, swapping the bytes if necessary
|
// Copy a single field from the input buffer to the output buffer, swapping the bytes if necessary
|
@ -217,7 +217,7 @@
|
|||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath=".\byteswap.cpp"
|
RelativePath=".\cbyteswap.cpp"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
@ -346,7 +346,7 @@
|
|||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\public\tier1\byteswap.h"
|
RelativePath="..\public\tier1\cbyteswap.h"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
|
@ -319,7 +319,7 @@
|
|||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="bitbuf.cpp" />
|
<ClCompile Include="bitbuf.cpp" />
|
||||||
<ClCompile Include="byteswap.cpp" />
|
<ClCompile Include="cbyteswap.cpp" />
|
||||||
<ClCompile Include="characterset.cpp" />
|
<ClCompile Include="characterset.cpp" />
|
||||||
<ClCompile Include="checksum_crc.cpp" />
|
<ClCompile Include="checksum_crc.cpp" />
|
||||||
<ClCompile Include="checksum_md5.cpp" />
|
<ClCompile Include="checksum_md5.cpp" />
|
||||||
@ -346,7 +346,7 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClInclude Include="..\public\tier1\bitbuf.h" />
|
<ClInclude Include="..\public\tier1\bitbuf.h" />
|
||||||
<ClInclude Include="..\public\tier1\byteswap.h" />
|
<ClInclude Include="..\public\tier1\cbyteswap.h" />
|
||||||
<ClInclude Include="..\public\tier1\callqueue.h" />
|
<ClInclude Include="..\public\tier1\callqueue.h" />
|
||||||
<ClInclude Include="..\public\tier1\characterset.h" />
|
<ClInclude Include="..\public\tier1\characterset.h" />
|
||||||
<ClInclude Include="..\public\tier1\checksum_crc.h" />
|
<ClInclude Include="..\public\tier1\checksum_crc.h" />
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
<ClCompile Include="bitbuf.cpp">
|
<ClCompile Include="bitbuf.cpp">
|
||||||
<Filter>Source Files</Filter>
|
<Filter>Source Files</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<ClCompile Include="byteswap.cpp">
|
<ClCompile Include="cbyteswap.cpp">
|
||||||
<Filter>Source Files</Filter>
|
<Filter>Source Files</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<ClCompile Include="characterset.cpp">
|
<ClCompile Include="characterset.cpp">
|
||||||
@ -76,7 +76,7 @@
|
|||||||
<ClInclude Include="..\public\tier1\bitbuf.h">
|
<ClInclude Include="..\public\tier1\bitbuf.h">
|
||||||
<Filter>Header Files</Filter>
|
<Filter>Header Files</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
<ClInclude Include="..\public\tier1\byteswap.h">
|
<ClInclude Include="..\public\tier1\cbyteswap.h">
|
||||||
<Filter>Header Files</Filter>
|
<Filter>Header Files</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
<ClInclude Include="..\public\tier1\callqueue.h">
|
<ClInclude Include="..\public\tier1\callqueue.h">
|
||||||
|
Loading…
x
Reference in New Issue
Block a user