RPCS3/archived-common
1
0
Fork 0
mirror of https://github.com/RPCS3/common.git synced 2026-01-31 01:25:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Relative includes in headers

Browse Source
This commit is contained in:
DHrpcs3
2015-12-21 15:08:18 +02:00
parent ab610deda9
commit d2619e94ec
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
common.vcxproj
View File

@@ -100,22 +100,22 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>$(SolutionDir)lib\$(Platform)-$(Configuration)\</OutDir>
<OutDir>$(SolutionDir)lib\$(Configuration)-$(Platform)\</OutDir>
<IntDir>$(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
<IncludePath>$(ProjectDir)include\common\;$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>$(SolutionDir)lib\$(Platform)-$(Configuration)\</OutDir>
<OutDir>$(SolutionDir)lib\$(Configuration)-$(Platform)\</OutDir>
<IntDir>$(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
<IncludePath>$(ProjectDir)include\common\;$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<OutDir>$(SolutionDir)lib\$(Platform)-$(Configuration)\</OutDir>
<OutDir>$(SolutionDir)lib\$(Configuration)-$(Platform)\</OutDir>
<IntDir>$(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
<IncludePath>$(ProjectDir)include\common\;$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<OutDir>$(SolutionDir)lib\$(Platform)-$(Configuration)\</OutDir>
<OutDir>$(SolutionDir)lib\$(Configuration)-$(Platform)\</OutDir>
<IntDir>$(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
<IncludePath>$(ProjectDir)include\common\;$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
</PropertyGroup>

2
include/common/File.h
View File

@@ -2,7 +2,7 @@
#include "types.h"
#include <vector>
#include <type_traits>
#include <StrFmt.h>
#include "StrFmt.h"
enum class fsm : u32 // file seek mode
{

2
include/common/SharedMutex.h
View File

@@ -3,7 +3,7 @@
#include <thread>
#include <mutex>
#include <atomic>
#include <Atomic.h>
#include "Atomic.h"
//! An attempt to create effective implementation of "shared mutex", lock-free in optimistic case.
//! All locking and unlocking may be done by single LOCK XADD or LOCK CMPXCHG instructions.

4
include/common/SleepQueue.h
View File

@@ -2,10 +2,12 @@
#include <deque>
#include <memory>
struct sleep_entry_t : std::enable_shared_from_this<sleep_entry_t>
struct sleep_entry_t : protected std::enable_shared_from_this<sleep_entry_t>
{
virtual void sleep() = 0;
virtual void awake() = 0;
friend class sleep_queue_entry_t;
};
using sleep_queue_t = std::deque<std::shared_ptr<sleep_entry_t>>;