diff options
author | Taybin Rutkin <taybin@taybin.com> | 2007-03-02 02:30:07 +0000 |
---|---|---|
committer | Taybin Rutkin <taybin@taybin.com> | 2007-03-02 02:30:07 +0000 |
commit | 918109c5551dabe03c31ccd65f5393244bc0c9ee (patch) | |
tree | 88bc11a4124e197aa9f7af2a06b3316674cbffa8 /libs | |
parent | f942909c77879e4fff9eacb2fe2c9008fef55286 (diff) |
Fix for compiler warnings and errors.
git-svn-id: svn://localhost/ardour2/trunk@1547 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
-rw-r--r-- | libs/ardour/audioengine.cc | 4 | ||||
-rw-r--r-- | libs/pbd/pbd/rcu.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc index 79ef344a1a..51251e1cba 100644 --- a/libs/ardour/audioengine.cc +++ b/libs/ardour/audioengine.cc @@ -225,9 +225,9 @@ AudioEngine::jack_sync_callback (jack_transport_state_t state, jack_position_t* { if (_jack && session) { return session->jack_sync_callback (state, pos); - } else { - return true; } + + return true; } int diff --git a/libs/pbd/pbd/rcu.h b/libs/pbd/pbd/rcu.h index c9088d51df..8b0b8b3548 100644 --- a/libs/pbd/pbd/rcu.h +++ b/libs/pbd/pbd/rcu.h @@ -25,7 +25,7 @@ class RCUManager protected: union { boost::shared_ptr<T>* m_rcu_value; - volatile gpointer gptr; + mutable volatile gpointer gptr; } x; }; |