INTEGRATION: CWS slideshowgcc (1.2.4); FILE MERGED

2005/02/11 17:49:09 hjs 1.2.4.1: #i42579# workaround gcc bug

1 files changed, 6 insertions, 17 deletions

diff --git a/slideshow/source/engine/waitsymbol.hxx b/slideshow/source/engine/waitsymbol.hxx
index 1382b66c1f2b..8679efe0e15d 100644
--- a/slideshow/source/engine/waitsymbol.hxx
+++ b/slideshow/source/engine/waitsymbol.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: waitsymbol.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: kz $ $Date: 2005-01-21 16:57:23 $
+ *  last change: $Author: vg $ $Date: 2005-02-16 15:35:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -112,23 +112,12 @@ private:
                   cppcanvas::CustomSpriteSharedPtr> > ViewsVecT;
     ViewsVecT m_views;
 
-    // interims solution only:
-    template <typename PairT>
-    static typename PairT::second_type const & mySelect2nd( PairT const & p ) {
-        return p.second;
-    }
     template <typename FuncT>
     FuncT for_each_sprite( FuncT func ) const {
-        std::for_each(
-            m_views.begin(), m_views.end(),
-            boost::bind( func,
-                         // select sprite:
-                         boost::bind(
-                             // due to bind problems:
-                             &WaitSymbol::mySelect2nd<
-                             ViewsVecT::value_type>,
-//                              std::select2nd<ViewsVecT::value_type>(),
-                             _1 ) ) );
+        ViewsVecT::const_iterator iPos( m_views.begin() );
+        const ViewsVecT::const_iterator iEnd( m_views.end() );
+        for ( ; iPos != iEnd; ++iPos )
+            func( iPos->second );
         return func;
     }