openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h..@apache.org
Subject svn commit: r1480391 - /openoffice/branches/rejuvenate01/main/slideshow/source/engine/animationfactory.cxx
Date Wed, 08 May 2013 18:25:32 GMT
Author: hdu
Date: Wed May  8 18:25:32 2013
New Revision: 1480391

URL: http://svn.apache.org/r1480391
Log:
#i122208# std::identity() didn't make it into the C++ standard

so we have to use our STL-wrapper for "functional" for now

Modified:
    openoffice/branches/rejuvenate01/main/slideshow/source/engine/animationfactory.cxx

Modified: openoffice/branches/rejuvenate01/main/slideshow/source/engine/animationfactory.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/slideshow/source/engine/animationfactory.cxx?rev=1480391&r1=1480390&r2=1480391&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/slideshow/source/engine/animationfactory.cxx (original)
+++ openoffice/branches/rejuvenate01/main/slideshow/source/engine/animationfactory.cxx Wed
May  8 18:25:32 2013
@@ -603,7 +603,7 @@ namespace slideshow
             {
                 return ::boost::shared_ptr< AnimationBase >( 
                     new GenericAnimation< AnimationBase, 
-                    					  ::std::identity< typename AnimationBase::ValueType > >(

+                                              std::identity< typename AnimationBase::ValueType
> >( 
                                               rShapeManager,
                                               nFlags,
                                               pIsValid,
@@ -611,8 +611,8 @@ namespace slideshow
                                               pGetValue,
                                               pSetValue,
                                               // no modification necessary, use identity
functor here
-                                              ::std::identity< typename AnimationBase::ValueType
>(),
-                                              ::std::identity< typename AnimationBase::ValueType
>() ) );
+                                              std::identity< typename AnimationBase::ValueType
>(),
+                                              std::identity< typename AnimationBase::ValueType
>()));
             }
 
             class Scaler



Mime
View raw message