From c20e55d07a252e4db800454fa361b8cc9a047879 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 26 Feb 2007 17:44:09 +0000 Subject: fix compiler complaints about RCU code; fix a couple of compiler warnings git-svn-id: svn://localhost/ardour2/trunk@1511 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/ardour_ui_options.cc | 4 ++-- libs/fst/vstwin.c | 2 +- libs/pbd/pbd/rcu.h | 19 +++++++++---------- vst/ardevst | 2 +- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc index ce03a90197..90e56ee532 100644 --- a/gtk2_ardour/ardour_ui_options.cc +++ b/gtk2_ardour/ardour_ui_options.cc @@ -77,7 +77,7 @@ ARDOUR_UI::toggle_send_midi_feedback () void ARDOUR_UI::set_native_file_header_format (HeaderFormat hf) { - const char *action; + const char *action = 0; switch (hf) { case BWF: @@ -119,7 +119,7 @@ ARDOUR_UI::set_native_file_header_format (HeaderFormat hf) void ARDOUR_UI::set_native_file_data_format (SampleFormat sf) { - const char* action; + const char* action = 0; switch (sf) { case FormatFloat: diff --git a/libs/fst/vstwin.c b/libs/fst/vstwin.c index 0ee34b70b4..62bab5b418 100644 --- a/libs/fst/vstwin.c +++ b/libs/fst/vstwin.c @@ -514,7 +514,7 @@ fst_load (const char *path) return NULL; } - if ((fhandle->main_entry = GetProcAddress (fhandle->dll, "main")) == NULL) { + if ((fhandle->main_entry = ((AEffect*)()(audioMasterCallback)) GetProcAddress (fhandle->dll, "main")) == NULL) { fst_unload (fhandle); return NULL; } diff --git a/libs/pbd/pbd/rcu.h b/libs/pbd/pbd/rcu.h index a8f3cdd5bc..c9088d51df 100644 --- a/libs/pbd/pbd/rcu.h +++ b/libs/pbd/pbd/rcu.h @@ -12,22 +12,21 @@ class RCUManager public: RCUManager (T* new_rcu_value) { - m_rcu_value = new boost::shared_ptr (new_rcu_value); + x.m_rcu_value = new boost::shared_ptr (new_rcu_value); } - virtual ~RCUManager() { delete m_rcu_value; } + virtual ~RCUManager() { delete x.m_rcu_value; } - boost::shared_ptr reader () const { return *((boost::shared_ptr *) g_atomic_pointer_get (the_pointer())); } + boost::shared_ptr reader () const { return *((boost::shared_ptr *) g_atomic_pointer_get (&x.gptr)); } virtual boost::shared_ptr write_copy () = 0; virtual bool update (boost::shared_ptr new_value) = 0; protected: - boost::shared_ptr* m_rcu_value; - - // this monstrosity is needed because of some wierd behavior by g++ - - gpointer * the_pointer() const { return (gpointer *) &m_rcu_value; } + union { + boost::shared_ptr* m_rcu_value; + volatile gpointer gptr; + } x; }; @@ -60,7 +59,7 @@ public: // store the current - current_write_old = RCUManager::m_rcu_value; + current_write_old = RCUManager::x.m_rcu_value; boost::shared_ptr new_copy (new T(**current_write_old)); @@ -76,7 +75,7 @@ public: // update, checking that nobody beat us to it - bool ret = g_atomic_pointer_compare_and_exchange (RCUManager::the_pointer(), + bool ret = g_atomic_pointer_compare_and_exchange (&RCUManager::x.gptr, (gpointer) current_write_old, (gpointer) new_spp); diff --git a/vst/ardevst b/vst/ardevst index 093c4b72da..ee27cb3f32 100755 --- a/vst/ardevst +++ b/vst/ardevst @@ -1,5 +1,5 @@ #!/bin/sh export ARDOUR_PATH=../gtk2_ardour/icons:../gtk2_ardour/pixmaps:../gtk2_ardour -export LD_LIBRARY_PATH=../gtk2_ardour:../libs/surfaces/control_protocol:../libs/ardour:../libs/midi++2:../libs/pbd:../libs/soundtouch:../libs/gtkmm2ext:../libs/sigc++2:../libs/glibmm2:../libs/gtkmm2/atk:../libs/gtkmm2/pango:../libs/gtkmm2/gdk:../libs/gtkmm2/gtk:../libs/libgnomecanvasmm:../libs/libsndfile:../libs/appleutility:$$LD_LIBRARY_PATH +export LD_LIBRARY_PATH=../gtk2_ardour:../libs/surfaces/control_protocol:../libs/ardour:../libs/midi++2:../libs/pbd:../libs/soundtouch:../libs/gtkmm2ext:../libs/sigc++2:../libs/glibmm2:../libs/gtkmm2/atk:../libs/gtkmm2/pango:../libs/gtkmm2/gdk:../libs/gtkmm2/gtk:../libs/libgnomecanvasmm:../libs/libsndfile:../libs/appleutility:$LD_LIBRARY_PATH export GTK_PATH=$PWD/../libs/clearlooks:~/.ardour2 exec wine ./ardour_vst.exe.so "$@" -- cgit v1.2.3