[Libreoffice-commits] core.git: 2 commits - dbaccess/source external/libetonyek

[Stephan Bergmann]

 dbaccess/source/core/recovery/subcomponentrecovery.cxx |    4 ++--
 external/libetonyek/UnpackedTarball_libetonyek.mk      |    1 +
 external/libetonyek/c++17.patch                        |   11 +++++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

New commits:
commit 583b49dca97c26365bd6bafafc422297aa7e9ed1
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Oct 25 19:35:45 2017 +0200

    Work around bogus Clang C++17 -Werror,-Wunused-value
    
    ...see <https://bugs.llvm.org/show_bug.cgi?id=35073> "Unexpected -Wunused-value
    with -std=c++17".  The dereference operator is only there to make OWeakObject's
    conversion operator to css::uno::Reference<css::uno::XInterface> kick in, to
    avoid an ambiguous conversion to XInterface, so use an rtl::Reference instead,
    which removes the need for the dereference and makes the warning go away.
    
    Change-Id: I52ddaa098d43eb1507ca621f9e9511dcfc0fdb9a

diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
index afd25657ae48..3e8dbea7a63a 100644
--- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx
+++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
@@ -536,7 +536,7 @@ namespace dbaccess
         if ( xDocDefinition.is() )
         {
             Reference< XController > xController( m_xDocumentUI, UNO_QUERY_THROW );
-            Reference< XInterface >( *new SubComponentLoader( xController, xDocDefinition ) );
+            rtl::Reference< SubComponentLoader >( new SubComponentLoader( xController, xDocDefinition ) );
         }
 
         return xSubComponent;
@@ -589,7 +589,7 @@ namespace dbaccess
         }
 
         Reference< XController > xController( m_xDocumentUI, UNO_QUERY_THROW );
-        Reference< XInterface >( *new SubComponentLoader( xController, xSubComponent ) );
+        rtl::Reference< SubComponentLoader >( new SubComponentLoader( xController, xSubComponent ) );
 
         return xSubComponent;
     }
commit 3c4011ea3552ee55ba8dc2c92639190016253b00
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Oct 25 19:34:52 2017 +0200

    external/libetonyek: drop "register", for C++17
    
    > Oct 24 18:21:51 <sberg_> dtardon, why is libetonyek-0.1.7.tar.xz containing
    >  generated src/lib/KEY1Token.inc; is that by design or by mistake?
    > Oct 24 18:23:32 <dtardon> sberg_, that's for windows
    > Oct 24 18:24:15 <sberg_> dtardon, yuck; then you should at least have
    >  generated it with a gperf that no longer emits "register" ;)
    > Oct 24 18:25:35 <dtardon> sberg_, bundled libetonyek is built as shared lib;
    >  the windows build is done as a Library, because the gcc wrapper for msvc
    >  cannot do shared libs. and it's easier to include the .inc files in the
    >  tarball than to re-create them using a CustomTarget inside libreoffice...
    > Oct 24 18:25:58 <dtardon> sberg_, i'm using gperf on f27
    > Oct 24 18:26:19 <dtardon> ... which is 3.1
    > Oct 24 18:29:26 <sberg_> dtardon, then maybe they only fixed gperf past 3.1; I
    >  have a local checkout (that still claims to be 3.1, though) that came with a
    >  commit dropping that "register" usage
    
    Change-Id: I6a3d965cedbe05582d9e42f5595876c19a1b91a6

diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk b/external/libetonyek/UnpackedTarball_libetonyek.mk
index f178b469e028..1b59b77cab97 100644
--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/external/libetonyek/UnpackedTarball_libetonyek.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\
 	external/libetonyek/ubsan.patch \
 	external/libetonyek/rpath.patch \
 	external/libetonyek/0001-add-missing-include-for-std-min.patch.1 \
+	external/libetonyek/c++17.patch \
 ))
 
 ifneq ($(OS),MACOSX)
diff --git a/external/libetonyek/c++17.patch b/external/libetonyek/c++17.patch
new file mode 100644
index 000000000000..bc4e9b96a46a
--- /dev/null
+++ b/external/libetonyek/c++17.patch
@@ -0,0 +1,11 @@
+--- src/lib/KEY1Token.inc
++++ src/lib/KEY1Token.inc
+@@ -524,7 +524,7 @@
+ 
+   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
+     {
+-      register int key = hash (str, len);
++      int key = hash (str, len);
+ 
+       if (key <= MAX_HASH_VALUE && key >= 0)
+         {