[Libreoffice-commits] core.git: 2 commits - external/clucene external/vigra

[Stephan Bergmann]

 external/clucene/patches/clucene-warnings.patch   |    3 ++-
 external/vigra/vigra1.6.0-unused-parameters.patch |   11 +++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 8c586582d93a3aaefd9e800da87a0d1ea8a260f8
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Nov 14 17:45:03 2013 +0100

    external/clucene: -Werror,-Wunused-parameter
    
    Change-Id: Iedb2d7c62f6498691bffd0beb529e479d62d004e

diff --git a/external/clucene/patches/clucene-warnings.patch b/external/clucene/patches/clucene-warnings.patch
index 1f1a29f..5f602c2 100644
--- a/external/clucene/patches/clucene-warnings.patch
+++ b/external/clucene/patches/clucene-warnings.patch
@@ -72,7 +72,7 @@
  #endif
 --- src/core/CLucene/util/Array.h	2012-02-22 12:37:22.510637696 +0000
 +++ src/core/CLucene/util/Array.h	2012-02-22 12:38:33.714444884 +0000
-@@ -7,6 +7,12 @@
+@@ -7,6 +7,13 @@
  #ifndef _lucene_util_Array_
  #define _lucene_util_Array_
  
@@ -80,6 +80,7 @@
 +#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
 +# pragma GCC diagnostic push
 +# pragma GCC diagnostic ignored "-Wshadow"
++# pragma GCC diagnostic ignored "-Wunused-parameter"
 +#endif
 +
  #include <stdlib.h>
commit a539950a6dbc6c19ab4f2757ca23a5ef8a7a5110
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Nov 14 17:39:51 2013 +0100

    external/vigra: -Werror,-Wunused-parameter
    
    Change-Id: Ide11bd4424fccd1cf57713128d06ba4f2207d0eb

diff --git a/external/vigra/vigra1.6.0-unused-parameters.patch b/external/vigra/vigra1.6.0-unused-parameters.patch
index 7e23531..946ec69 100644
--- a/external/vigra/vigra1.6.0-unused-parameters.patch
+++ b/external/vigra/vigra1.6.0-unused-parameters.patch
@@ -29,3 +29,14 @@
  
      static reference dereference(BaseType const & d)
          { return d; }
+--- misc/vigra1.6.0/include/vigra/rgbvalue.hxx
++++ misc/build/vigra1.6.0/include/vigra/rgbvalue.hxx
+@@ -184,7 +184,7 @@
+         /** Construct from another sequence (must have length 3!)
+         */
+     template <class Iterator>
+-    RGBValue(Iterator i, Iterator end)
++    RGBValue(Iterator i, __attribute__ ((unused)) Iterator)
+     : Base(i[0], i[1], i[2])
+     {
+         VIGRA_STATIC_ASSERT((RGBValue_bad_color_indices<RED_IDX, GREEN_IDX, BLUE_IDX>));