Skip to content

Commit

Permalink
Changed weak_atomic to compile with newer glibc std::atomic copy/move…
Browse files Browse the repository at this point in the history
… ctors (issue cameron314#61)
  • Loading branch information
cameron314 committed Jul 11, 2018
1 parent 07e22ec commit 562a795
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions atomicops.h
Original file line number Diff line number Diff line change
Expand Up @@ -237,8 +237,8 @@ class weak_atomic
// Work around bug with universal reference/nullptr combination that only appears when /clr is on
weak_atomic(nullptr_t) : value(nullptr) { }
#endif
weak_atomic(weak_atomic const& other) : value(other.value) { }
weak_atomic(weak_atomic&& other) : value(std::move(other.value)) { }
weak_atomic(weak_atomic const& other) : value(other.load()) { }
weak_atomic(weak_atomic&& other) : value(std::move(other.load())) { }
#ifdef AE_VCPP
#pragma warning(pop)
#endif
Expand Down

0 comments on commit 562a795

Please sign in to comment.