diff options
| -rw-r--r-- | raul/AtomicInt.hpp | 1 | ||||
| -rw-r--r-- | raul/AtomicPtr.hpp | 2 | ||||
| -rw-r--r-- | wscript | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/raul/AtomicInt.hpp b/raul/AtomicInt.hpp index 63d5071..a8e6714 100644 --- a/raul/AtomicInt.hpp +++ b/raul/AtomicInt.hpp @@ -34,6 +34,7 @@ public: inline int get() const { return _val.load(); } inline void operator=(int val) { _val = val; } + inline void operator=(const AtomicInt& val) { _val = val.get(); } inline void operator+=(int val) { _val += val; } diff --git a/raul/AtomicPtr.hpp b/raul/AtomicPtr.hpp index 28797de..0de323c 100644 --- a/raul/AtomicPtr.hpp +++ b/raul/AtomicPtr.hpp @@ -18,6 +18,8 @@ #ifndef RAUL_ATOMIC_PTR_HPP #define RAUL_ATOMIC_PTR_HPP +#include <cstddef> + #ifdef RAUL_CPP0x #include <atomic> @@ -67,10 +67,10 @@ def configure(conf): if Options.options.log_debug: autowaf.define(conf, 'RAUL_LOG_DEBUG', 1) - if Options.options.cpp0x: conf.env.append_value('CXXFLAGS', [ '-std=c++0x' ]) autowaf.check_header(conf, 'cxx', 'memory') + autowaf.check_header(conf, 'cxx', 'atomic') autowaf.define(conf, 'RAUL_CPP0x', 1) else: autowaf.check_header(conf, 'cxx', 'boost/shared_ptr.hpp') |