fixes for MSVC2010

Author: Koen Deforche

CMakeLists.txt

@@ -43,6 +43,13 @@ IF(NOT SHARED_LIBS)
   ENDIF(WIN32)
 ENDIF(NOT SHARED_LIBS)
 
+IF(WIN32)
+  IF(SHARED_LIBS)
+    # See http://svn.boost.org/trac/boost/ticket/3465
+    SET(WT_NO_BOOST_INTRUSIVE true)
+  ENDIF(SHARED_LIBS)
+ENDIF(WIN32)
+
 # Fixup Windows declspec stuff
 IF(NOT SHARED_LIBS)
   SET(WT_STATIC true)

WConfig.h.in

@@ -29,6 +29,8 @@
 #cmakedefine WT_HAS_WRASTERIMAGE
 #cmakedefine WT_HAS_WPDFIMAGE
 
+#cmakedefine WT_NO_BOOST_INTRUSIVE
+
 #if ${WT_DEBUG_ENABLED}
 #ifndef WT_TARGET_JAVA
   #define WT_DEBUG(statement) do { if (Wt::WApplication::instance()->debug()) statement; } while(0)

src/Wt/WSignal

@@ -10,14 +10,6 @@
 #include <Wt/WObject>
 #include <bitset>
 
-#if defined(WIN32) && defined(wt_EXPORTS)
-// boost intrusive compilation fails with static asserts when Wt is compiled
-// as a DLL on windows. This hack makes all static asserts succeed.
-namespace boost {
-  template<bool x> struct STATIC_ASSERTION_FAILURE { enum { value = 1 }; };
-}
-#endif
-
 #include <boost/bind.hpp>
 #include <boost/intrusive/list.hpp>
 #include <boost/signal.hpp>
@@ -441,9 +433,9 @@ public:
  * \ingroup signalslot
  */
 class WT_API EventSignalBase : public SignalBase
-#ifndef WT_TARGET_JAVA
+#if !(defined(WT_TARGET_JAVA) || defined(WT_NO_BOOST_INTRUSIVE))
 			     ,public boost::intrusive::list_base_hook<>
-#endif // WT_TARGET_JAVA
+#endif
 {
 public:
   virtual ~EventSignalBase();