diff options
| author | John Emmas <johne53@tiscali.co.uk> | 2013-10-18 10:03:22 +0100 |
|---|---|---|
| committer | John Emmas <johne53@tiscali.co.uk> | 2013-10-18 10:03:22 +0100 |
| commit | b855e5f3220027502a3c88f189d511fe2a5a3c2b (patch) | |
| tree | b106fabe68c471cb95688e151e8466dac3e0ea4c /libs/pbd/pbd/signals.h | |
| parent | 75b933eadbe8f90a73a29bb207ff26eebcd4121a (diff) | |
| parent | 5ba369918b07a4c0859f0e94537da7b5a11bb49f (diff) | |
Merge remote-tracking branch 'remotes/origin/exportvis' into windows+cc
Conflicts (hopefully resolved):
gtk2_ardour/wscript
libs/ardour/ardour/audioregion.h
libs/ardour/ardour/debug.h
libs/ardour/ardour/directory_names.h
libs/ardour/ardour/filesystem_paths.h
libs/ardour/ardour/session_event.h
libs/gtkmm2ext/gtkmm2ext/utils.h
libs/panners/1in2out/wscript
libs/panners/2in2out/wscript
libs/panners/vbap/wscript
libs/pbd/pbd/debug.h
libs/pbd/pbd/file_utils.h
libs/pbd/pbd/pathexpand.h
libs/pbd/pbd/ringbuffer.h
libs/pbd/pbd/ringbufferNPT.h
libs/pbd/pbd/search_path.h
libs/pbd/pbd/stacktrace.h
libs/pbd/pbd/uuid.h
libs/pbd/pbd/uuid_boost.h
libs/surfaces/control_protocol/control_protocol/basic_ui.h
libs/surfaces/control_protocol/control_protocol/control_protocol.h
Diffstat (limited to 'libs/pbd/pbd/signals.h')
| -rw-r--r-- | libs/pbd/pbd/signals.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libs/pbd/pbd/signals.h b/libs/pbd/pbd/signals.h index 140ea014e8..3896fd55b5 100644 --- a/libs/pbd/pbd/signals.h +++ b/libs/pbd/pbd/signals.h @@ -36,13 +36,14 @@ #include <boost/enable_shared_from_this.hpp> #include <boost/optional.hpp> +#include "pbd/libpbd_visibility.h" #include "pbd/event_loop.h" namespace PBD { -class Connection; +class LIBPBD_API Connection; -class SignalBase +class LIBPBD_API SignalBase { public: virtual ~SignalBase () {} @@ -52,7 +53,7 @@ protected: Glib::Threads::Mutex _mutex; }; -class Connection : public boost::enable_shared_from_this<Connection> +class LIBPBD_API Connection : public boost::enable_shared_from_this<Connection> { public: Connection (SignalBase* b) : _signal (b) {} @@ -78,7 +79,7 @@ private: }; template<typename R> -class OptionalLastValue +class LIBPBD_API OptionalLastValue { public: typedef boost::optional<R> result_type; @@ -97,7 +98,7 @@ public: typedef boost::shared_ptr<Connection> UnscopedConnection; -class ScopedConnection +class LIBPBD_API ScopedConnection { public: ScopedConnection () {} @@ -128,7 +129,7 @@ private: UnscopedConnection _c; }; -class ScopedConnectionList : public boost::noncopyable +class LIBPBD_API ScopedConnectionList : public boost::noncopyable { public: ScopedConnectionList(); |