From de968af32a356a43922f0b1da477b795c78ce929 Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Sat, 4 Oct 2014 08:32:52 +0100 Subject: [PATCH 1/5] Fix typo, see https://svn.boost.org/trac/boost/ticket/10590 --- include/boost/config/stdlib/libcpp.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/boost/config/stdlib/libcpp.hpp b/include/boost/config/stdlib/libcpp.hpp index 5d60cfcf..eee2d75d 100644 --- a/include/boost/config/stdlib/libcpp.hpp +++ b/include/boost/config/stdlib/libcpp.hpp @@ -31,7 +31,7 @@ # define BOOST_NO_CXX11_ALLOCATOR #endif -#if __cpluplus < 201103 +#if __cplusplus < 201103 # define BOOST_NO_CXX11_HDR_ARRAY # define BOOST_NO_CXX11_HDR_CODECVT # define BOOST_NO_CXX11_HDR_CONDITION_VARIABLE From 122a60c77fccf11c80b4c68ebb895c2bd1482243 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Wed, 5 Nov 2014 00:42:37 +0000 Subject: [PATCH 2/5] Version bump --- include/boost/version.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/boost/version.hpp b/include/boost/version.hpp index c156fd79..0cadccc8 100644 --- a/include/boost/version.hpp +++ b/include/boost/version.hpp @@ -19,7 +19,7 @@ // BOOST_VERSION / 100 % 1000 is the minor version // BOOST_VERSION / 100000 is the major version -#define BOOST_VERSION 105700 +#define BOOST_VERSION 105800 // // BOOST_LIB_VERSION must be defined to be the same as BOOST_VERSION @@ -27,6 +27,6 @@ // number, y is the minor version number, and z is the patch level if not 0. // This is used by to select which library version to link to. -#define BOOST_LIB_VERSION "1_57" +#define BOOST_LIB_VERSION "1_58" #endif From 6038d5fd7e86ecb46708c921b9e77eda9869eae4 Mon Sep 17 00:00:00 2001 From: Jessica Hamilton Date: Sun, 16 Nov 2014 13:28:57 +1300 Subject: [PATCH 3/5] haiku: add platform support --- include/boost/config/platform/haiku.hpp | 34 +++++++++++++++++++ .../boost/config/select_platform_config.hpp | 4 +++ include/boost/config/stdlib/libstdcpp3.hpp | 3 +- 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 include/boost/config/platform/haiku.hpp diff --git a/include/boost/config/platform/haiku.hpp b/include/boost/config/platform/haiku.hpp new file mode 100644 index 00000000..5b2cd03f --- /dev/null +++ b/include/boost/config/platform/haiku.hpp @@ -0,0 +1,34 @@ +// (C) Copyright John Maddock 2001. +// Use, modification and distribution are subject to the +// Boost Software License, Version 1.0. (See accompanying file +// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) + +// See http://www.boost.org for most recent version. + +// Haiku specific config options: + +#define BOOST_PLATFORM "Haiku" + +#define BOOST_HAS_UNISTD_H +#define GLIBC_HAVE_LONG_LONG +#define BOOST_HAS_STDINT_H +#define BOOST_HASH_NO_EXTENSIONS + +#ifndef BOOST_DISABLE_THREADS +# define BOOST_HAS_THREADS +#endif + +#define BOOST_NO_CXX11_HDR_TYPE_TRAITS +#define BOOST_NO_CXX11_ATOMIC_SMART_PTR +#define BOOST_NO_CXX11_STATIC_ASSERT +#define BOOST_NO_CXX11_VARIADIC_MACROS + +// +// thread API's not auto detected: +// +#define BOOST_HAS_SCHED_YIELD +#define BOOST_HAS_PTHREAD_YIELD +#define BOOST_HAS_GETTIMEOFDAY + +// boilerplate code: +#include diff --git a/include/boost/config/select_platform_config.hpp b/include/boost/config/select_platform_config.hpp index 2dddc6a2..acd1409e 100644 --- a/include/boost/config/select_platform_config.hpp +++ b/include/boost/config/select_platform_config.hpp @@ -41,6 +41,10 @@ // win32: # define BOOST_PLATFORM_CONFIG "boost/config/platform/win32.hpp" +#elif defined(__HAIKU__) +// Haiku +# define BOOST_PLATFORM_CONFIG "boost/config/platform/haiku.hpp" + #elif defined(__BEOS__) // BeOS # define BOOST_PLATFORM_CONFIG "boost/config/platform/beos.hpp" diff --git a/include/boost/config/stdlib/libstdcpp3.hpp b/include/boost/config/stdlib/libstdcpp3.hpp index b26d1ff9..24c768cb 100644 --- a/include/boost/config/stdlib/libstdcpp3.hpp +++ b/include/boost/config/stdlib/libstdcpp3.hpp @@ -36,7 +36,8 @@ || defined(_GLIBCXX__PTHREADS) \ || defined(_GLIBCXX_HAS_GTHREADS) \ || defined(_WIN32) \ - || defined(_AIX) + || defined(_AIX) \ + || defined(__HAIKU__) // // If the std lib has thread support turned on, then turn it on in Boost // as well. We do this because some gcc-3.4 std lib headers define _REENTANT From 1b6d6d9aa1daec00e8f33f229077974d15739ff4 Mon Sep 17 00:00:00 2001 From: Jessica Hamilton Date: Sun, 16 Nov 2014 21:43:03 +1300 Subject: [PATCH 4/5] haiku: fix copyright --- include/boost/config/platform/haiku.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/boost/config/platform/haiku.hpp b/include/boost/config/platform/haiku.hpp index 5b2cd03f..7b296000 100644 --- a/include/boost/config/platform/haiku.hpp +++ b/include/boost/config/platform/haiku.hpp @@ -1,4 +1,4 @@ -// (C) Copyright John Maddock 2001. +// (C) Copyright Jessica Hamilton 2014. // Use, modification and distribution are subject to the // Boost Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) From 44028a148c0eb7f7a9239523a0f5fc90670b87f1 Mon Sep 17 00:00:00 2001 From: Jessica Hamilton Date: Sun, 16 Nov 2014 21:56:05 +1300 Subject: [PATCH 5/5] haiku: remove spurious GLIBC define --- include/boost/config/platform/haiku.hpp | 1 - 1 file changed, 1 deletion(-) diff --git a/include/boost/config/platform/haiku.hpp b/include/boost/config/platform/haiku.hpp index 7b296000..e3910d84 100644 --- a/include/boost/config/platform/haiku.hpp +++ b/include/boost/config/platform/haiku.hpp @@ -10,7 +10,6 @@ #define BOOST_PLATFORM "Haiku" #define BOOST_HAS_UNISTD_H -#define GLIBC_HAVE_LONG_LONG #define BOOST_HAS_STDINT_H #define BOOST_HASH_NO_EXTENSIONS