diff options
author | Jung-uk Kim <jkim@FreeBSD.org> | 2014-05-06 23:42:09 +0000 |
---|---|---|
committer | Jung-uk Kim <jkim@FreeBSD.org> | 2014-05-06 23:42:09 +0000 |
commit | 644ca3f58b13704189fbf00f4ef344a99c478f54 (patch) | |
tree | 5eb2acd0f56ef6ba64489252dda6b2d17141ee77 | |
parent | Update to 2.0.14. (diff) |
Fix several preprocessor warnings.
https://svn.boost.org/trac/boost/ticket/6142
https://svn.boost.org/trac/boost/ticket/8368
https://svn.boost.org/trac/boost/ticket/9397
10 files changed, 127 insertions, 1 deletions
diff --git a/devel/boost-libs/Makefile b/devel/boost-libs/Makefile index bf408b6da709..3c315995e462 100644 --- a/devel/boost-libs/Makefile +++ b/devel/boost-libs/Makefile @@ -4,7 +4,7 @@ PORTNAME= boost-libs COMMENT= Free portable C++ libraries (without Boost.Python) -PORTREVISION= 1 +PORTREVISION= 2 BUILD_DEPENDS+= bjam:${PORTSDIR}/devel/boost-jam diff --git a/devel/boost-libs/files/patch-boost__mpl__has_xxx.hpp b/devel/boost-libs/files/patch-boost__mpl__has_xxx.hpp new file mode 100644 index 000000000000..087b4ccccc19 --- /dev/null +++ b/devel/boost-libs/files/patch-boost__mpl__has_xxx.hpp @@ -0,0 +1,38 @@ +--- boost/mpl/has_xxx.hpp.orig 2010-07-18 20:46:31.000000000 -0400 ++++ boost/mpl/has_xxx.hpp 2014-05-06 17:10:52.000000000 -0400 +@@ -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) diff --git a/devel/boost-libs/files/patch-boost__multi_array__base.hpp b/devel/boost-libs/files/patch-boost__multi_array__base.hpp new file mode 100644 index 000000000000..7bec82f61fff --- /dev/null +++ b/devel/boost-libs/files/patch-boost__multi_array__base.hpp @@ -0,0 +1,11 @@ +--- boost/multi_array/base.hpp.orig 2012-05-17 10:52:48.000000000 -0400 ++++ boost/multi_array/base.hpp 2014-05-06 17:14:55.000000000 -0400 +@@ -65,7 +65,7 @@ + // object creation in small-memory environments. Thus, the objects + // can be left undefined by defining BOOST_MULTI_ARRAY_NO_GENERATORS + // before loading multi_array.hpp. +-#if !BOOST_MULTI_ARRAY_NO_GENERATORS ++#ifndef BOOST_MULTI_ARRAY_NO_GENERATORS + namespace { + multi_array_types::extent_gen extents; + multi_array_types::index_gen indices; diff --git a/devel/boost-libs/files/patch-boost__predef__os__bsd.h b/devel/boost-libs/files/patch-boost__predef__os__bsd.h new file mode 100644 index 000000000000..674a33088d6d --- /dev/null +++ b/devel/boost-libs/files/patch-boost__predef__os__bsd.h @@ -0,0 +1,11 @@ +--- boost/predef/os/bsd.h.orig 2013-10-15 01:23:53.000000000 -0400 ++++ boost/predef/os/bsd.h 2014-05-06 18:06:32.000000000 -0400 +@@ -59,7 +59,7 @@ + #define BOOST_OS_BSD BOOST_VERSION_NUMBER_NOT_AVAILABLE + #endif + +-#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ ++#if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \ + defined(BSD) || \ + defined(_SYSTYPE_BSD) \ + ) diff --git a/devel/boost-libs/files/patch-boost__predef__os__bsd__bsdi.h b/devel/boost-libs/files/patch-boost__predef__os__bsd__bsdi.h new file mode 100644 index 000000000000..7396a63505b6 --- /dev/null +++ b/devel/boost-libs/files/patch-boost__predef__os__bsd__bsdi.h @@ -0,0 +1,11 @@ +--- boost/predef/os/bsd/bsdi.h.orig 2013-10-15 01:23:53.000000000 -0400 ++++ boost/predef/os/bsd/bsdi.h 2014-05-06 18:06:28.000000000 -0400 +@@ -24,7 +24,7 @@ + + #define BOOST_OS_BSD_BSDI BOOST_VERSION_NUMBER_NOT_AVAILABLE + +-#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ ++#if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \ + defined(__bsdi__) \ + ) + # ifndef BOOST_OS_BSD_AVAILABLE diff --git a/devel/boost-libs/files/patch-boost__predef__os__bsd__dragonfly.h b/devel/boost-libs/files/patch-boost__predef__os__bsd__dragonfly.h new file mode 100644 index 000000000000..79a943da3300 --- /dev/null +++ b/devel/boost-libs/files/patch-boost__predef__os__bsd__dragonfly.h @@ -0,0 +1,11 @@ +--- boost/predef/os/bsd/dragonfly.h.orig 2013-10-15 01:23:53.000000000 -0400 ++++ boost/predef/os/bsd/dragonfly.h 2014-05-06 18:06:28.000000000 -0400 +@@ -24,7 +24,7 @@ + + #define BOOST_OS_BSD_DRAGONFLY BOOST_VERSION_NUMBER_NOT_AVAILABLE + +-#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ ++#if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \ + defined(__DragonFly__) \ + ) + # ifndef BOOST_OS_BSD_AVAILABLE diff --git a/devel/boost-libs/files/patch-boost__predef__os__bsd__free.h b/devel/boost-libs/files/patch-boost__predef__os__bsd__free.h new file mode 100644 index 000000000000..aff0282d9f55 --- /dev/null +++ b/devel/boost-libs/files/patch-boost__predef__os__bsd__free.h @@ -0,0 +1,11 @@ +--- boost/predef/os/bsd/free.h.orig 2013-10-15 01:23:53.000000000 -0400 ++++ boost/predef/os/bsd/free.h 2014-05-06 17:25:43.000000000 -0400 +@@ -26,7 +26,7 @@ + + #define BOOST_OS_BSD_FREE BOOST_VERSION_NUMBER_NOT_AVAILABLE + +-#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ ++#if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \ + defined(__FreeBSD__) \ + ) + # ifndef BOOST_OS_BSD_AVAILABLE diff --git a/devel/boost-libs/files/patch-boost__predef__os__bsd__net.h b/devel/boost-libs/files/patch-boost__predef__os__bsd__net.h new file mode 100644 index 000000000000..3582e8c7020d --- /dev/null +++ b/devel/boost-libs/files/patch-boost__predef__os__bsd__net.h @@ -0,0 +1,11 @@ +--- boost/predef/os/bsd/net.h.orig 2013-10-15 01:23:53.000000000 -0400 ++++ boost/predef/os/bsd/net.h 2014-05-06 18:06:32.000000000 -0400 +@@ -31,7 +31,7 @@ + + #define BOOST_OS_BSD_NET BOOST_VERSION_NUMBER_NOT_AVAILABLE + +-#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ ++#if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \ + defined(__NETBSD__) || defined(__NetBSD__) \ + ) + # ifndef BOOST_OS_BSD_AVAILABLE diff --git a/devel/boost-libs/files/patch-boost__predef__os__bsd__open.h b/devel/boost-libs/files/patch-boost__predef__os__bsd__open.h new file mode 100644 index 000000000000..d774de5d5de6 --- /dev/null +++ b/devel/boost-libs/files/patch-boost__predef__os__bsd__open.h @@ -0,0 +1,11 @@ +--- boost/predef/os/bsd/open.h.orig 2013-10-15 01:23:53.000000000 -0400 ++++ boost/predef/os/bsd/open.h 2014-05-06 18:06:32.000000000 -0400 +@@ -55,7 +55,7 @@ + + #define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER_NOT_AVAILABLE + +-#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ ++#if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \ + defined(__OpenBSD__) \ + ) + # ifndef BOOST_OS_BSD_AVAILABLE diff --git a/devel/boost-libs/files/patch-boost__predef__os__macos.h b/devel/boost-libs/files/patch-boost__predef__os__macos.h new file mode 100644 index 000000000000..d106a35724bc --- /dev/null +++ b/devel/boost-libs/files/patch-boost__predef__os__macos.h @@ -0,0 +1,11 @@ +--- boost/predef/os/macos.h.orig 2013-10-15 01:23:53.000000000 -0400 ++++ boost/predef/os/macos.h 2014-05-06 18:06:32.000000000 -0400 +@@ -31,7 +31,7 @@ + + #define BOOST_OS_MACOS BOOST_VERSION_NUMBER_NOT_AVAILABLE + +-#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ ++#if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \ + defined(macintosh) || defined(Macintosh) || \ + (defined(__APPLE__) && defined(__MACH__)) \ + ) |