[Libreoffice-commits] core.git: 2 commits - boost/boost.6142.warnings.patch.1 boost/UnpackedTarball_boost.mk np_sdk/inc

[Michael Stahl]

 boost/UnpackedTarball_boost.mk    |    2 ++
 boost/boost.6142.warnings.patch.1 |   38 ++++++++++++++++++++++++++++++++++++++
 np_sdk/inc/npapi.h                |    4 ++--
 3 files changed, 42 insertions(+), 2 deletions(-)

New commits:
commit c9226b841a056246c349177f4a4d62ed8b93bf00
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Apr 1 13:44:16 2013 +0200

    np_sdk: fix -Wundef
    
    Change-Id: Id806e33457ff0c828f55db1fe5e5444e208d2a1e

diff --git a/np_sdk/inc/npapi.h b/np_sdk/inc/npapi.h
index aff8490..1a14ee9 100644
--- a/np_sdk/inc/npapi.h
+++ b/np_sdk/inc/npapi.h
@@ -384,7 +384,7 @@ typedef enum {
   , NPPVpluginCoreAnimationLayer = 1003
 #endif
 
-#if (MOZ_PLATFORM_MAEMO == 5) || (MOZ_PLATFORM_MAEMO == 6)
+#if defined(MOZ_PLATFORM_MAEMO) && ((MOZ_PLATFORM_MAEMO == 5) || (MOZ_PLATFORM_MAEMO == 6))
   , NPPVpluginWindowlessLocalBool = 2002
 #endif
 } NPPVariable;
@@ -435,7 +435,7 @@ typedef enum {
   , NPNVsupportsUpdatedCocoaTextInputBool = 3002 /* TRUE if the browser supports the updated
                                                     Cocoa text input specification. */
 #endif
-#if (MOZ_PLATFORM_MAEMO == 5) || (MOZ_PLATFORM_MAEMO == 6)
+#if defined(MOZ_PLATFORM_MAEMO) && ((MOZ_PLATFORM_MAEMO == 5) || (MOZ_PLATFORM_MAEMO == 6))
   , NPNVSupportsWindowlessLocal = 2002
 #endif
 } NPNVariable;
commit 2b4ee9bc454b812d92deb2201e23b485ccb64796
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Apr 1 13:40:50 2013 +0200

    boost: add patch for -Wundef warnings from ticket 6142
    
    Change-Id: I6bd1b84c491ed05292b253e6df48176ac3ea9053

diff --git a/boost/UnpackedTarball_boost.mk b/boost/UnpackedTarball_boost.mk
index fde6fa6..2987682 100644
--- a/boost/UnpackedTarball_boost.mk
+++ b/boost/UnpackedTarball_boost.mk
@@ -32,6 +32,8 @@ boost_patches += boost.4510.warnings.patch
 boost_patches += boost.6940.glibc.patch
 #https://svn.boost.org/trac/boost/ticket/7774
 boost_patches += boost.7774.warnings.patch.1
+#https://svn.boost.org/trac/boost/ticket/6142
+boost_patches += boost.6142.warnings.patch.1
 
 boost_patches += boost.windows.patch
 boost_patches += boost.vc2012.patch
diff --git a/boost/boost.6142.warnings.patch.1 b/boost/boost.6142.warnings.patch.1
new file mode 100644
index 0000000..b38efd9
--- /dev/null
+++ b/boost/boost.6142.warnings.patch.1
@@ -0,0 +1,38 @@
+--- a/boost/mpl/has_xxx.hpp.orig	2011-11-18 13:45:00.000000000 +0100
++++ b/boost/mpl/has_xxx.hpp	2011-11-18 13:47:19.000000000 +0100
+@@ -341,7 +341,7 @@
+       ) \
+     /**/
+ 
+-#   if !BOOST_MPL_HAS_XXX_NO_EXPLICIT_TEST_FUNCTION
++#   if !defined(BOOST_MPL_HAS_XXX_NO_EXPLICIT_TEST_FUNCTION) || !BOOST_MPL_HAS_XXX_NO_EXPLICIT_TEST_FUNCTION
+ #     define BOOST_MPL_HAS_MEMBER_REJECT(args, member_macro) \
+         template< typename V > \
+         static boost::mpl::aux::no_tag \
+@@ -354,7 +354,7 @@
+       /**/
+ #   endif
+ 
+-#   if !BOOST_MPL_HAS_XXX_NO_WRAPPED_TYPES
++#   if !defined(BOOST_MPL_HAS_XXX_NO_WRAPPED_TYPES) || !BOOST_MPL_HAS_XXX_NO_WRAPPED_TYPES
+ #     define BOOST_MPL_HAS_MEMBER_MULTI_ACCEPT(z, n, args) \
+         template< typename V > \
+         static boost::mpl::aux::yes_tag \
+@@ -383,7 +383,7 @@
+       /**/
+ #   endif
+ 
+-#   if !BOOST_MPL_HAS_XXX_NO_EXPLICIT_TEST_FUNCTION
++#   if !defined(BOOST_MPL_HAS_XXX_NO_EXPLICIT_TEST_FUNCTION) || !BOOST_MPL_HAS_XXX_NO_EXPLICIT_TEST_FUNCTION
+ #     define BOOST_MPL_HAS_MEMBER_TEST(args) \
+           sizeof(BOOST_MPL_HAS_MEMBER_INTROSPECTION_TEST_NAME(args)< U >(0)) \
+               == sizeof(boost::mpl::aux::yes_tag) \
+@@ -456,7 +456,7 @@
+       ) \
+     /**/
+ 
+-#   if BOOST_MPL_HAS_XXX_NEEDS_TEMPLATE_SFINAE
++#   if defined(BOOST_MPL_HAS_XXX_NEEDS_TEMPLATE_SFINAE) && BOOST_MPL_HAS_XXX_NEEDS_TEMPLATE_SFINAE
+ 
+ #     if !defined(BOOST_MPL_HAS_XXX_NEEDS_NAMESPACE_LEVEL_SUBSTITUTE)
+ #       if BOOST_WORKAROUND(BOOST_MSVC, <= 1400)