Skip to content

Commit f1852c8

Browse files
committed
Replace ambiguous include
"#include "StdAfx.h"" would include a different file depending on the target -xrGame and xrPhysics- at that stage of the build. Removing it must be followed by the addition of some includes in xrCore to make the compiler happy.
1 parent 3fdf11d commit f1852c8

File tree

5 files changed

+7
-2
lines changed

5 files changed

+7
-2
lines changed

src/xrCore/FS.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include "_vector3d.h"
1313
#include "_vector4.h"
1414
#include "_color.h"
15+
#include "xrstring.h"
1516
#include "xrCommon/math_funcs.h"
1617
#include "xrCommon/xr_stack.h"
1718

src/xrCore/net_utils.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#define _INCDEF_NETUTILS_H_
44
#include <string.h>
55
#include "xrCore/_types.h"
6+
#include "xrCore/_matrix.h"
67
#include "client_id.h"
78
#include "xrCommon/xr_string.h"
89

@@ -13,7 +14,6 @@ template <class T> struct _vector4;
1314
typedef _vector4<float> Fvector4;
1415
class shared_str;
1516

16-
1717
#pragma pack(push, 1)
1818

1919
const u32 NET_PacketSizeLimit = 16 * 1024;

src/xrCore/xrMemory.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#pragma once
22

3+
#include "Common/Common.hpp"
34
#include "_types.h"
45

56
#include "tbb/tbb_allocator.h"

src/xrServerEntities/PHNetState.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
#include "stdafx.h"
21
#pragma hdrstop
32

43
#include "PHNetState.h"
4+
#include "xrCore/net_utils.h"
5+
#include "xrCore/FS.h"
56

67
//////////////////////////////////////8/////////////////////////////////////////////////////
78

src/xrServerEntities/PHNetState.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
#include "xrCommon/xr_vector.h"
77

88
class NET_Packet;
9+
class IReader;
10+
class IWriter;
911

1012
struct SPHNetState
1113
{

0 commit comments

Comments
 (0)