archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-16 03:38:38 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix some compiling problems on OSX

Browse source 
and enable osx builds on travis
This commit is contained in:
Danila Malyutin 2015-08-17 18:14:29 +03:00 • committed by Nekotekina
parent e8088d1216
commit 009370f73c
6 changed files with 79 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Utilities/BEType.h
View file

@ -1,5 +1,11 @@
#pragma once
#ifdef _MSC_VER
#include <intrin.h>
#else
#include <x86intrin.h>
#endif
#define IS_LE_MACHINE // only draft
union u128

2
Utilities/Thread.cpp
View file

@ -1234,7 +1234,7 @@ thread_t::thread_t(std::function<std::string()> name, std::function<void()> func
start(std::move(name), func);
}
thread_t::~thread_t() noexcept(false)
thread_t::~thread_t() //noexcept(false)
{
if (m_thread)
{

2
Utilities/Thread.h
View file

@ -49,7 +49,7 @@ public:
thread_t(std::function<std::string()> name, std::function<void()> func);
// destructor, joins automatically (questionable, don't rely on this functionality in derived destructors)
virtual ~thread_t() noexcept(false);
virtual ~thread_t() /*noexcept(false) compile error on osx*/;
thread_t(const thread_t&) = delete;