Merge windows+cc branch into cairocanvas branch. Not finished, need to now merge windows branch to get changes from there

This commit is contained in:
Paul Davis 2014-01-10 16:07:57 -05:00
commit 3020b224fa
466 changed files with 10821 additions and 1674 deletions

View file

@ -44,7 +44,7 @@ namespace PBD {
LIBPBD_API std::string demangle (const std::string&);
template<typename T>
class LIBPBD_API thing_with_backtrace
class /*LIBPBD_API*/ thing_with_backtrace
{
public:
thing_with_backtrace () {
@ -113,11 +113,11 @@ private:
static Glib::Threads::Mutex all_mutex;
};
template<typename T> LIBPBD_API std::list<PBD::thing_with_backtrace<T> *> PBD::thing_with_backtrace<T>::all;
template<typename T> LIBPBD_API Glib::Threads::Mutex PBD::thing_with_backtrace<T>::all_mutex;
template<typename T> /*LIBPBD_API*/ std::list<PBD::thing_with_backtrace<T> *> PBD::thing_with_backtrace<T>::all;
template<typename T> /*LIBPBD_API*/ Glib::Threads::Mutex PBD::thing_with_backtrace<T>::all_mutex;
} // namespace PBD
// JE - !!!!#include "../pbd/stacktrace.impl"
#endif /* __libpbd_stacktrace_h__ */