From 548ea31e83050b493267f7631eb1b32053c5a1b4 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Thu, 7 Jan 2016 22:45:11 +0000 Subject: [PATCH] Fix compilation on gcc before 4.7 due to use of atomic builtins. --- src/linkgraph/linkgraphjob.cpp | 2 +- src/linkgraph/linkgraphschedule.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/linkgraph/linkgraphjob.cpp b/src/linkgraph/linkgraphjob.cpp index d3c16a1299..eb95b93be4 100644 --- a/src/linkgraph/linkgraphjob.cpp +++ b/src/linkgraph/linkgraphjob.cpp @@ -179,7 +179,7 @@ LinkGraphJob::~LinkGraphJob() */ bool LinkGraphJob::IsJobCompleted() const { -#if defined(__GNUC__) && (__cplusplus >= 201103L || defined(__STDCXX_VERSION__) || defined(__GXX_EXPERIMENTAL_CXX0X__) || defined(__GXX_EXPERIMENTAL_CPP0X__)) +#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) return __atomic_load_n(&job_completed, __ATOMIC_RELAXED); #else return job_completed; diff --git a/src/linkgraph/linkgraphschedule.cpp b/src/linkgraph/linkgraphschedule.cpp index 4a0d7013b4..a08b53411e 100644 --- a/src/linkgraph/linkgraphschedule.cpp +++ b/src/linkgraph/linkgraphschedule.cpp @@ -99,7 +99,7 @@ void LinkGraphSchedule::JoinNext() * This is just a hint variable to avoid performing the join excessively early and blocking the main thread. */ -#if defined(__GNUC__) && (__cplusplus >= 201103L || defined(__STDCXX_VERSION__) || defined(__GXX_EXPERIMENTAL_CXX0X__) || defined(__GXX_EXPERIMENTAL_CPP0X__)) +#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) __atomic_store_n(&(job->job_completed), true, __ATOMIC_RELAXED); #else job->job_completed = true;