[Libreoffice-commits] .: boost/boost.6397.warnings.patch

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Thu Nov 1 17:21:39 PDT 2012


 boost/boost.6397.warnings.patch |   34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

New commits:
commit 069e4f80333b5d4027d91d334bc8dae6f5a68533
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Nov 1 23:26:43 2012 +0000

    WaE: extra clang warnings
    
    Change-Id: I69b105c39f67372331910b6957214d62e1f3818c

diff --git a/boost/boost.6397.warnings.patch b/boost/boost.6397.warnings.patch
index 380dfbc..c544d54 100644
--- a/boost/boost.6397.warnings.patch
+++ b/boost/boost.6397.warnings.patch
@@ -336,3 +336,37 @@
  
      std::transform(new_array.index_base_list_.begin(),
                     new_array.index_base_list_.end(),
+--- misc/boost_1_44_0/boost/random/mersenne_twister.hpp
++++ misc/build/boost_1_44_0/boost/random/mersenne_twister.hpp
+@@ -195,16 +195,16 @@
+   }
+ #endif
+ 
+-  friend bool operator==(const mersenne_twister& x, const mersenne_twister& y)
++  friend bool operator==(const mersenne_twister& x_, const mersenne_twister& y_)
+   {
+     for(int j = 0; j < state_size; ++j)
+-      if(x.compute(j) != y.compute(j))
++      if(x_.compute(j) != y_.compute(j))
+         return false;
+     return true;
+   }
+ 
+-  friend bool operator!=(const mersenne_twister& x, const mersenne_twister& y)
+-  { return !(x == y); }
++  friend bool operator!=(const mersenne_twister& x_, const mersenne_twister& y_)
++  { return !(x_ == y_); }
+ #else
+   // Use a member function; Streamable concept not supported.
+   bool operator==(const mersenne_twister& rhs) const
+--- misc/boost_1_44_0/boost/uuid/uuid_io.hpp
++++ misc/build/boost_1_44_0/boost/uuid/uuid_io.hpp
+@@ -59,7 +59,7 @@
+         }
+         
+         if (flags & std::ios_base::left) {
+-            for (std::streamsize i=uuid_width; i<width; i++) {
++            for (std::streamsize s=uuid_width; s<width; ++s) {
+                 os << fill;
+             }
+         }


More information about the Libreoffice-commits mailing list