diff options
| author | David Robillard <d@drobilla.net> | 2008-11-27 22:25:02 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-11-27 22:25:02 +0000 |
| commit | 4c5bd342b96d96db0491092b4577891d2780716b (patch) | |
| tree | 97fc10474425a5e52bb1709f7aa1119ca4e8bce8 | |
| parent | 7c747ee2e46efa63e0868da02166e024260d2516 (diff) | |
| download | raul-4c5bd342b96d96db0491092b4577891d2780716b.tar.gz raul-4c5bd342b96d96db0491092b4577891d2780716b.tar.bz2 raul-4c5bd342b96d96db0491092b4577891d2780716b.zip | |
Fix warnings for non-debug builds.
git-svn-id: http://svn.drobilla.net/lad/trunk/raul@1804 a436a847-0d15-0410-975c-d299462d15a1
| -rw-r--r-- | raul/AtomicPtr.hpp | 6 | ||||
| -rw-r--r-- | tests/midi_ringbuffer_test.cpp | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/raul/AtomicPtr.hpp b/raul/AtomicPtr.hpp index d978de2..3a5ddcd 100644 --- a/raul/AtomicPtr.hpp +++ b/raul/AtomicPtr.hpp @@ -37,14 +37,14 @@ public: { return (T*)g_atomic_pointer_get((volatile gpointer*)(&_val)); } inline void operator=(T* val) - { g_atomic_pointer_set((volatile gpointer*)(&_val), (gpointer)val); } + { g_atomic_pointer_set(&_val, static_cast<gpointer>(val)); } /** Set value to newval iff current value is oldval */ inline bool compare_and_exchange(int oldval, int newval) - { return g_atomic_pointer_compare_and_exchange((volatile gpointer*)(&_val), oldval, newval); } + { return g_atomic_pointer_compare_and_exchange(&_val, oldval, newval); } private: - mutable T* volatile _val; + mutable volatile gpointer _val; }; diff --git a/tests/midi_ringbuffer_test.cpp b/tests/midi_ringbuffer_test.cpp index 98c251b..05a7e35 100644 --- a/tests/midi_ringbuffer_test.cpp +++ b/tests/midi_ringbuffer_test.cpp @@ -17,7 +17,9 @@ read_write_test(EventRingBuffer& rb, unsigned offset) snprintf((char*)buf, 5, "%d", offset); size = strlen((char*)buf); +#ifndef NDEBUG size_t written = rb.write(t, size, buf); +#endif assert(written == size); for (size_t i=0; i < 4; ++i) |