Merge branch 'master' into cairocanvas

[ardour.git] / libs / pbd / pbd / abstract_ui.cc

diff --git a/libs/pbd/pbd/abstract_ui.cc b/libs/pbd/pbd/abstract_ui.cc
index 64fd718dbc457a559ed3492ae5685acb69329160..67c39b57e44f31c7f30cc30ec8d8d478bbc509b9 100644 (file)
--- a/libs/pbd/pbd/abstract_ui.cc
+++ b/libs/pbd/pbd/abstract_ui.cc
@@ -28,6 +28,15 @@
 
 #include "i18n.h"
 
+#ifdef COMPILER_MSVC
+#include <ardourext/misc.h>  // Needed for 'DECLARE_DEFAULT_COMPARISONS'. Objects in an STL container can be
+                             // searched and sorted. Thus, when instantiating the container, MSVC complains
+                             // if the type of object being contained has no appropriate comparison operators
+                             // defined (specifically, if operators '<' and '==' are undefined). This seems
+                             // to be the case with ptw32 'pthread_t' which is a simple struct.
+DECLARE_DEFAULT_COMPARISONS(ptw32_handle_t)
+#endif
+
 using namespace std;
 
 template<typename RequestBuffer> void 
@@ -349,7 +358,7 @@ AbstractUI<RequestObject>::send_request (RequestObject *req)
                   at the per-thread and generic request lists.
                */
 
-               request_channel.wakeup ();
+               signal_new_request ();
        }
 }