Skip to content

Commit

Permalink
Replace ambiguous include
Browse files Browse the repository at this point in the history
"#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.
  • Loading branch information
Zegeri committed Sep 16, 2018
1 parent 3fdf11d commit f1852c8
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 2 deletions.
1 change: 1 addition & 0 deletions src/xrCore/FS.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include "_vector3d.h"
#include "_vector4.h"
#include "_color.h"
#include "xrstring.h"
#include "xrCommon/math_funcs.h"
#include "xrCommon/xr_stack.h"

Expand Down
2 changes: 1 addition & 1 deletion src/xrCore/net_utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#define _INCDEF_NETUTILS_H_
#include <string.h>
#include "xrCore/_types.h"
#include "xrCore/_matrix.h"
#include "client_id.h"
#include "xrCommon/xr_string.h"

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


#pragma pack(push, 1)

const u32 NET_PacketSizeLimit = 16 * 1024;
Expand Down
1 change: 1 addition & 0 deletions src/xrCore/xrMemory.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#pragma once

#include "Common/Common.hpp"
#include "_types.h"

#include "tbb/tbb_allocator.h"
Expand Down
3 changes: 2 additions & 1 deletion src/xrServerEntities/PHNetState.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#include "stdafx.h"
#pragma hdrstop

#include "PHNetState.h"
#include "xrCore/net_utils.h"
#include "xrCore/FS.h"

//////////////////////////////////////8/////////////////////////////////////////////////////

Expand Down
2 changes: 2 additions & 0 deletions src/xrServerEntities/PHNetState.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
#include "xrCommon/xr_vector.h"

class NET_Packet;
class IReader;
class IWriter;

struct SPHNetState
{
Expand Down

0 comments on commit f1852c8

Please sign in to comment.