Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SofaKernel] FIX: A few fix to compile on Mac OSX Xcode 9 and Linux gcc 7.3.0 #969

Merged
merged 7 commits into from
Mar 28, 2019
Prev Previous commit
Next Next commit
[SimulationCore] Fix compiling error: initialization of std::atomic_flag
  • Loading branch information
fspadoni committed Mar 15, 2019
commit cddb536e75f1551d8bcd87fccb96cfdab0fa3c51
3 changes: 2 additions & 1 deletion SofaKernel/framework/sofa/simulation/Locks.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ namespace sofa
public:

SpinLock()
:_flag()
{}

~SpinLock()
Expand Down Expand Up @@ -70,7 +71,7 @@ namespace sofa

private:

std::atomic_flag _flag = ATOMIC_FLAG_INIT;
std::atomic_flag _flag;

char _pad [CACHE_LINE - sizeof(std::atomic_flag)];
};
Expand Down