[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sal/inc sc/inc

[Don Lewis]

 sal/inc/sal/types.h |    8 ++++++++
 sc/inc/compiler.hxx |    6 +++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit cc9823f5bde6f49eb75e4ad0e8f8a162bf341f34
Author: Don Lewis <truckman at apache.org>
Date:   Thu Sep 1 06:47:05 2016 +0000

    Fix -Wunused-private-field errors in sc/inc/compiler.hxx.  The structure
    
    ScDoubleRawToken contains four unused private fields.  Mark these as
    unused to eliminate the warning message.  We can't delete these fields
    because we want the layout of this structure to match ScRawToken.

diff --git a/sal/inc/sal/types.h b/sal/inc/sal/types.h
index 8f829d3..2bad6d6 100644
--- a/sal/inc/sal/types.h
+++ b/sal/inc/sal/types.h
@@ -235,6 +235,14 @@ typedef void *                   sal_Handle;
 #   define SAL_MAX_ENUM 0x7fff
 #endif
 
+#if defined(__GNUC__) || defined(__clang__)
+#define SAL_UNUSED(__x__)   __x__ __attribute((__unused__))
+#elif defined(_MSC_VER)
+#define SAL_UNUSED(__x__)   __pragma(warning(suppress:4100;suppress:4101)) __x__
+#else
+#define SAL_UNUSED(__x__)   __x__
+#endif
+
 #if defined(_MSC_VER) || defined(__MINGW32__)
 #   define SAL_DLLPUBLIC_EXPORT    __declspec(dllexport)
 #if defined(_MSC_VER)
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index ffb2cab..bd05000 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -116,7 +116,11 @@ class ScTokenArray;
 struct ScDoubleRawToken
 {
 private:
-    SC_TOKEN_FIX_MEMBERS
+    // SC_TOKEN_FIX_MEMBERS
+    OpCode   SAL_UNUSED(eOp);
+    formula::StackVar SAL_UNUSED(eType);
+    sal_uInt16   SAL_UNUSED(nRefCnt);
+    sal_Bool     SAL_UNUSED(bRaw);
 public:
     union
     {   // union only to assure alignment identical to ScRawToken