[Libreoffice-commits] .: 3 commits - boost/boost_1_44_0-clang-warnings.patch boost/boost.7551.unusedvars.patch slideshow/source

[Libreoffice Gerrit user]

 boost/boost.7551.unusedvars.patch                                 |    2 -
 boost/boost_1_44_0-clang-warnings.patch                           |   12 +++++++++-
 slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm |    2 -
 3 files changed, 13 insertions(+), 3 deletions(-)

New commits:
commit 7f78980ea260999c88878e362a4d6948d41ddbd8
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Dec 10 09:05:57 2012 +0200

    WaE: non-constant-expression cannot be narrowed to float in initializer list
    
    More of the -Wc++11-narrowing warnings.
    
    Change-Id: If371de0f480119d9b6f5fdc10b67484eb63c9d61

diff --git a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
index 963f072..3a260e3 100644
--- a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
+++ b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
@@ -379,7 +379,7 @@ bool OGLTransitionerImpl::initWindowFromSlideShowView( const Reference< presenta
     Window *pFrameWindow = pPWindow->GetWindow(WINDOW_FRAME);
     Size aFrameSize( pFrameWindow->GetSizePixel() );
     Point aScreen( pPWindow->OutputToScreenPixel( Point() ) );
-    GLWin.aInitFrame = (NSRect){ { aScreen.X(), aFrameSize.Height() - GLWin.Height - aScreen.Y() }, { GLWin.Width, GLWin.Height } };
+    GLWin.aInitFrame = (NSRect){ { static_cast<CGFloat>(aScreen.X()), static_cast<CGFloat>(aFrameSize.Height() - GLWin.Height - aScreen.Y()) }, { static_cast<CGFloat>(GLWin.Width), static_cast<CGFloat>(GLWin.Height) } };
 
     GLWin.pAquaOpenGLView = (AquaOpenGLView *)[[NSOpenGLView alloc]initWithFrame: GLWin.aInitFrame pixelFormat: fmt];
     OSL_ENSURE(GLWin.pAquaOpenGLView, "Could not create NSOPenGLView");
commit 6981889b0ab9618defa81d7a59f87aada05adc5e
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Dec 10 08:52:34 2012 +0200

    WaE: unused parameter
    
    Change-Id: Idd9e548ac4258332d741bd7bb1d39d521d8e5c7a

diff --git a/boost/boost_1_44_0-clang-warnings.patch b/boost/boost_1_44_0-clang-warnings.patch
index f48910e..cf7603a 100644
--- a/boost/boost_1_44_0-clang-warnings.patch
+++ b/boost/boost_1_44_0-clang-warnings.patch
@@ -97,4 +97,14 @@
          }
      }
      
-
+--- misc/boost_1_44_0/boost/random/discard_block.hpp
++++ misc/build/boost_1_44_0/boost/random/discard_block.hpp
+@@ -76,7 +76,7 @@
+ 
+   result_type min BOOST_PREVENT_MACRO_SUBSTITUTION () const { return (_rng.min)(); }
+   result_type max BOOST_PREVENT_MACRO_SUBSTITUTION () const { return (_rng.max)(); }
+-  static bool validation(result_type x) { return true; }  // dummy
++  static bool validation(result_type) { return true; }  // dummy
+ 
+ #ifndef BOOST_NO_OPERATORS_IN_NAMESPACE
+ 
commit 56ec8f4ef1935af73b874ab11928bac4c867b40a
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Dec 10 08:39:51 2012 +0200

    Fix warning: missing header for unified diff at line 3 of patch
    
    Change-Id: Ie52c139ee7cb4f7f2bb8f6d5225eed200e1fdc00

diff --git a/boost/boost.7551.unusedvars.patch b/boost/boost.7551.unusedvars.patch
index 839f925..a80d4a1 100644
--- a/boost/boost.7551.unusedvars.patch
+++ b/boost/boost.7551.unusedvars.patch
@@ -1,5 +1,5 @@
 --- misc/boost_1_44_0/boost/date_time/tz_db_base.hpp
---- misc/build/boost_1_44_0/boost/date_time/tz_db_base.hpp
++++ misc/build/boost_1_44_0/boost/date_time/tz_db_base.hpp
 @@ -170,7 +170,6 @@
        /*! May throw data_not_accessible, or bad_field_count exceptions */
        void load_from_file(const std::string& pathspec)