CWS-TOOLING: integrate CWS boost134

2009-09-09 10:30:24 +0200 fs  r275970 : #i100127# provided by rene: check whether system-boost's function.hpp compiles without exception support
2009-09-04 21:58:00 +0200 fs  r275832 : indention
2009-09-04 21:57:10 +0200 fs  r275831 : #i10000# type in boost/spirit check. Thanks to thb
2009-09-04 10:58:54 +0200 fs  r275787 : #i100127# provided by tono@openoffice.org: mingw needs using directives for std::min/max
2009-09-04 10:31:54 +0200 fs  r275782 : #i100127# (approved by hjs) on Solaris, set GNUTAR to /usr/sfw/bin/gtar, this is available on baseline machines (Solaris 10.x), but not necessarily available in LD_LIBRARY_PATH
2009-08-19 21:47:55 +0200 rene  r275161 : #i10000# check for the header actually used now
2009-08-17 21:55:31 +0200 fs  r275073 : CWS-TOOLING: rebase CWS boost134 to trunk@275001 (milestone: DEV300:m55)
2009-07-16 09:39:25 +0200 fs  r274031 : #i100127# extract download/% with GNUTAR instead of TAR
2009-07-14 09:18:15 +0200 fs  r273960 : CWS-TOOLING: rebase CWS boost134 to trunk@273858 (milestone: DEV300:m52)
2009-07-13 09:55:14 +0200 fs  r273919 : #i100127# use boost 1.39, not 1.34
2009-07-13 09:45:57 +0200 fs  r273918 : use GNUTAR when extracting download/%.tar.gz, not TAR (necessary with boost 1.39 tarball)
2009-07-10 21:10:52 +0200 fs  r273905 : #i100127# spirit now part of boost
2009-07-06 12:12:13 +0200 fs  r273732 : #i10000# lngconvex, used in src/wizards, is built in shell => added missing module dependency
2009-07-02 15:34:51 +0200 fs  r273660 : #i100127#
2009-07-02 13:35:24 +0200 fs  r273645 : #i100127# MSVC needs some hinting when using boost::bind on (some) member functions
2009-07-02 10:33:59 +0200 fs  r273625 : removed unused include (lead to an internal compiler error with MSVC and boost 1.34+)
2009-07-02 09:44:35 +0200 fs  r273619 : change some include orders, prevents 'internal compiler errors' with MSVC
2009-07-01 09:19:25 +0200 fs  r273547 : #i100127# who the heck is defining max as something unusable?
2009-07-01 09:17:28 +0200 fs  r273546 : #i100127# defining min/max is causing trouble now
2009-07-01 09:15:40 +0200 fs  r273545 : #i100127# reverted previous patch, and properly fixed the problem by defining BOOST_MEM_FN_ENABLE_CDECL, and disabling warning 4180
2009-07-01 09:14:23 +0200 fs  r273544 : #i100127# re-disable warning 4180, still needed for some files
2009-07-01 09:07:33 +0200 fs  r273543 : #i100127# reverted previous patch, and properly fixed the problem by defining BOOST_MEM_FN_ENABLE_CDECL
2009-06-24 11:00:32 +0200 fs  r273319 : oops, re-introduced some inc locations
2009-06-23 22:10:02 +0200 fs  r273304 : #i100127# disable warning C4180
2009-06-23 22:08:36 +0200 fs  r273303 : #i100127# disable warning C4180
2009-06-16 12:26:49 +0200 fs  r273015 : #i10000# (provided by mst@openoffice.org)
2009-06-15 09:10:27 +0200 fs  r272962 : #i10000# use -r instead of -a when copying the include files, this prevents the spurious 'failed to preserve ownership' errors
2009-06-11 23:55:06 +0200 fs  r272902 : #i100127#
2009-06-11 23:54:47 +0200 fs  r272901 : #i100127#
2009-06-11 23:54:05 +0200 fs  r272900 : make compile on unxsol[i|s]4
2009-06-10 10:12:22 +0200 fs  r272798 : #i100127# don't deliver from within unxlngi6/misc/build/boost, but from a 'normalized' location unxlngi6/inc
2009-06-10 09:48:00 +0200 fs  r272795 : #i100127# use 1.34.1 unconditionally on all platforms

5 files changed, 12 insertions, 12 deletions

diff --git a/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx b/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx
index cced9fa3f83f..683fe7bd9707 100644
--- a/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx
+++ b/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx
@@ -34,11 +34,11 @@
 #include <canvas/debug.hxx>
 #include <canvas/verbosetrace.hxx>
 
+#include "delayevent.hxx"
 #include "eventqueue.hxx"
 #include "usereventqueue.hxx"
 #include "sequentialtimecontainer.hxx"
 #include "tools.hxx"
-#include "delayevent.hxx"
 
 #include <boost/bind.hpp>
 #include <algorithm>
@@ -63,7 +63,7 @@ void SequentialTimeContainer::activate_st()
     {
         // deactivate ASAP:
         scheduleDeactivationEvent(
-            makeEvent( boost::bind( &AnimationNode::deactivate, getSelf() ) ) );
+            makeEvent( boost::bind< void >( boost::mem_fn( &AnimationNode::deactivate ), getSelf() ) ) );
     }
     else // use default
         scheduleDeactivationEvent();
@@ -89,7 +89,7 @@ void SequentialTimeContainer::skipEffect(
         // empty all events ignoring timings => until next effect
         getContext().mrEventQueue.forceEmpty();
         getContext().mrEventQueue.addEventForNextRound(
-            makeEvent( boost::bind(&AnimationNode::deactivate, pChildNode) ) );
+            makeEvent( boost::bind<void>( boost::mem_fn( &AnimationNode::deactivate ), pChildNode ) ) );
     }
     else
         OSL_ENSURE( false, "unknown notifier!" );
diff --git a/slideshow/source/engine/makefile.mk b/slideshow/source/engine/makefile.mk
index ba00e028b9ff..b064ad7b94cb 100644
--- a/slideshow/source/engine/makefile.mk
+++ b/slideshow/source/engine/makefile.mk
@@ -43,6 +43,8 @@ ENABLE_EXCEPTIONS=TRUE
 
 # --- Common ----------------------------------------------------------
 
+ENVCFLAGS += -DBOOST_SPIRIT_USE_OLD_NAMESPACE
+
 .IF "$(OS)"=="SOLARIS"
 .IF "$(CCNUMVER)"=="00050009"
 # SunStudio12: anachronism warning in boost code (smilfunctionparser.cxx)
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index ac0f256324d7..d8dc7931add1 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -1668,7 +1668,7 @@ void SlideShowImpl::notifySlideAnimationsEnded()
         // schedule a slide end event, with automatic mode's
         // delay
         aNotificationEvents = makeInterruptableDelay(
-            boost::bind( &SlideShowImpl::notifySlideEnded, this ),
+            boost::bind<void>( boost::mem_fn(&SlideShowImpl::notifySlideEnded), this ),
             maEventMultiplexer.getAutomaticTimeout() );
     }
     else
@@ -1693,7 +1693,7 @@ void SlideShowImpl::notifySlideAnimationsEnded()
             bHasAutomaticNextSlide )
         {
             aNotificationEvents = makeInterruptableDelay(
-                boost::bind( &SlideShowImpl::notifySlideEnded, this ),
+                boost::bind<void>( boost::mem_fn(&SlideShowImpl::notifySlideEnded), this ),
                 nAutomaticNextSlideTimeout);
 
             // TODO(F2): Provide a mechanism to let the user override
@@ -1709,8 +1709,8 @@ void SlideShowImpl::notifySlideAnimationsEnded()
             // generate interruptable event here, there's no
             // timeout involved.
             aNotificationEvents.mpImmediateEvent =
-                makeEvent( boost::bind(
-                               &SlideShowImpl::notifySlideEnded, this ) );
+                makeEvent( boost::bind<void>(
+                    boost::mem_fn(&SlideShowImpl::notifySlideEnded), this ) );
         }
     }
 
diff --git a/slideshow/source/engine/smilfunctionparser.cxx b/slideshow/source/engine/smilfunctionparser.cxx
index 04e0368ff6d7..3ae24d87b9a8 100644
--- a/slideshow/source/engine/smilfunctionparser.cxx
+++ b/slideshow/source/engine/smilfunctionparser.cxx
@@ -55,7 +55,7 @@
 #include <typeinfo>
 #define BOOST_SPIRIT_DEBUG
 #endif
-#include <boost/spirit/core.hpp>
+#include <boost/spirit/include/classic_core.hpp>
 
 #if OSL_DEBUG_LEVEL > 0
 #include <iostream>
diff --git a/slideshow/source/inc/delayevent.hxx b/slideshow/source/inc/delayevent.hxx
index 29ef713f6550..10960e395feb 100644
--- a/slideshow/source/inc/delayevent.hxx
+++ b/slideshow/source/inc/delayevent.hxx
@@ -30,12 +30,10 @@
 #ifndef INCLUDED_SLIDESHOW_DELAYEVENT_HXX
 #define INCLUDED_SLIDESHOW_DELAYEVENT_HXX
 
+#include <boost/function.hpp>
+
 #include "event.hxx"
 #include <boost/noncopyable.hpp>
-#include <boost/function.hpp>
-#if defined(VERBOSE) && defined(DBG_UTIL)
-#include "boost/current_function.hpp"
-#endif
 
 namespace slideshow {
 namespace internal {