gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix libcxxabi clang compile failure in travis, as well as bool issue due to old clang

Browse Source 
Former-commit-id: 79e5160e376cfedc690d351d49c3327d5f48c580
This commit is contained in:
John Sully 2019-06-18 00:06:42 -04:00
parent 61015908ab
commit dbc8272acf
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -16,10 +16,11 @@ matrix:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- os: linux - os: linux
script: make MALLOC=libc script: make MALLOC=libc
env: COMPILER_NAME=clang CXX=clang++-3.8 CC=clang-3.8 CXXFLAGS="-stdlib=libc++" LDFLAGS="-stdlib=libc++" env: COMPILER_NAME=clang CXX=clang++-3.8 CC=clang-3.8 CXXFLAGS="-I/usr/include/libcxxabi/" LDFLAGS="-lc++"
addons: addons:
apt: apt:
packages: packages:
- libc++abi-dev
- clang-3.8 - clang-3.8
- libc++-dev - libc++-dev
- libc++abi-dev - libc++abi-dev

4
src/ae.cpp
View File

@ -803,9 +803,9 @@ void aeAcquireLock()
g_lock.lock(); g_lock.lock();
} }
int aeTryAcquireLock(bool fWeak) int aeTryAcquireLock(int fWeak)
{ {
return g_lock.try_lock(fWeak); return g_lock.try_lock(!!fWeak);
} }
void aeReleaseLock() void aeReleaseLock()

2
src/ae.h
View File

@ -159,7 +159,7 @@ int aeGetSetSize(aeEventLoop *eventLoop);
int aeResizeSetSize(aeEventLoop *eventLoop, int setsize); int aeResizeSetSize(aeEventLoop *eventLoop, int setsize);
void aeAcquireLock(); void aeAcquireLock();
int aeTryAcquireLock(bool fWeak); int aeTryAcquireLock(int fWeak);
void aeReleaseLock(); void aeReleaseLock();
int aeThreadOwnsLock(); int aeThreadOwnsLock();