Author: truckman
Date: Sat Sep 3 08:46:17 2016
New Revision: 1759058
URL: http://svn.apache.org/viewvc?rev=1759058&view=rev
Log:
Fix an error and update boost's logic for enabling the use of
variadic templates when compiling wth g++. It was enabling them
unconditionally for g++ > 5.0. g++ warns about the use of variadic
templates unless a non-default -std option is specified for any
version older than 6.1, which switched to C++14 as its default.
Modified:
openoffice/trunk/main/boost/boost_1_55_0.patch
Modified: openoffice/trunk/main/boost/boost_1_55_0.patch
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/boost/boost_1_55_0.patch?rev=1759058&r1=1759057&r2=1759058&view=diff
==============================================================================
--- openoffice/trunk/main/boost/boost_1_55_0.patch (original)
+++ openoffice/trunk/main/boost/boost_1_55_0.patch Sat Sep 3 08:46:17 2016
@@ -326,3 +326,24 @@ diff -ur misc/boost_1_55_0/boost/unorder
}
////////////////////////////////////////////////////////////////////////
+diff -ur misc/boost_1_55_0/boost/config/compiler/gcc.hpp
misc/build/boost_1_55_0/boost/config/compiler/gcc.hpp
+--- misc/boost_1_55_0/boost/config/compiler/gcc.hpp 2013-09-17
09:55:51.000000000 -0700
++++ misc/build/boost_1_55_0/boost/config/compiler/gcc.hpp 2016-09-02
19:15:48.775411000 -0700
+@@ -137,7 +137,7 @@
+
+ // C++0x features in 4.3.n and later
+ //
+-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 2)) &&
defined(__GXX_EXPERIMENTAL_CXX0X__)
++#if ((__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 2)) &&
defined(__GXX_EXPERIMENTAL_CXX0X__)) || (__GNUC__ > 6) || (__GNUC__ == 6 &&
__GNUC_MINOR__ > 0)
+ // C++0x features are only enabled when -std=c++0x or -std=gnu++0x are
+ // passed on the command line, which in turn defines
+ // __GXX_EXPERIMENTAL_CXX0X__.
+@@ -153,7 +153,7 @@
+
+ // Variadic templates compiler:
+ // http://www.generic-programming.org/~dgregor/cpp/variadic-templates.html
+-# if defined(__VARIADIC_TEMPLATES) || (__GNUC__ > 4) || ((__GNUC__ == 4) &&
(__GNUC_MINOR__ >= 4) && defined(__GXX_EXPERIMENTAL_CXX0X__))
++# if defined(__VARIADIC_TEMPLATES) || ((__GNUC__ > 4 || (__GNUC__ == 4 &&
__GNUC_MINOR__ > 2)) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || (__GNUC__ > 6)
|| (__GNUC__ == 6 && __GNUC_MINOR__ > 0)
+ # define BOOST_HAS_VARIADIC_TMPL
+ # else
+ # define BOOST_NO_CXX11_VARIADIC_TEMPLATES
