From ce0959ba62623bbad078c58736eab1b542456518 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 29 Dec 2014 11:26:49 -0600 Subject: [PATCH] Fix Haiku detection syntax error when Haiku is not detected. Bump version to 1.2 and update docs. --- doc/history.qbk | 8 ++- doc/html/index.html | 8 +-- doc/html/predef/acknoledgements.html | 12 ++-- doc/html/predef/adding_new_predefs.html | 4 +- doc/html/predef/history.html | 19 ++++- doc/html/predef/introduction.html | 6 +- doc/html/predef/reference.html | 4 +- .../boost_arch_architecture_macros.html | 2 +- .../reference/boost_comp_compiler_macros.html | 2 +- .../boost_lang_language_standards_ma.html | 2 +- .../reference/boost_lib_library_macros.html | 2 +- .../boost_os_operating_system_macros.html | 72 ++++++++++++++----- .../reference/boost_plat_platform_macros.html | 2 +- doc/html/predef/reference/other_macros.html | 2 +- .../reference/version_definition_macros.html | 2 +- doc/html/predef/to_do.html | 4 +- doc/html/predef/using_the_predefs.html | 4 +- doc/predef.qbk | 4 +- include/boost/predef/os/haiku.h | 3 +- include/boost/predef/version.h | 2 +- 20 files changed, 111 insertions(+), 53 deletions(-) diff --git a/doc/history.qbk b/doc/history.qbk index b2fb81e..3af8394 100644 --- a/doc/history.qbk +++ b/doc/history.qbk @@ -7,12 +7,18 @@ http://www.boost.org/LICENSE_1_0.txt) [section History] +[heading 1.2] + +* Account for skip in Visual Studio product version vs. compiler version. + This supports version of VS 2015 an onward. +* Add detection of Haiku OS (from Jessica Hamilton). + [heading 1.1] * Addition of `BOOST_PLAT_*` platform definitions for MinGW and Windows platform variants. * Detection of ARM architecture for Windows compilers to target - mobile devices of WIndows 8. + mobile devices of Windows 8. * Improved ARM detection for 64 bit ARM. * Added detection of iOS an an operating system. * Improved detection of endianess on some platforms. diff --git a/doc/html/index.html b/doc/html/index.html index 024453d..cdff0db 100644 --- a/doc/html/index.html +++ b/doc/html/index.html @@ -1,10 +1,10 @@ -Predef 1.1 +Predef 1.2 - + @@ -13,7 +13,7 @@

-Predef 1.1

+Predef 1.2

Rene Rivera

@@ -52,7 +52,7 @@
- +

Last revised: June 04, 2014 at 03:28:01 GMT

Last revised: December 29, 2014 at 17:24:18 GMT
diff --git a/doc/html/predef/acknoledgements.html b/doc/html/predef/acknoledgements.html index 7573714..90439da 100644 --- a/doc/html/predef/acknoledgements.html +++ b/doc/html/predef/acknoledgements.html @@ -4,8 +4,8 @@ Acknoledgements - - + + @@ -27,10 +27,10 @@ This library would be an incoherent mess if it weren't for Boost community that provided invaluable feedback for the eight years that it took to polish into a useable form. In particular I would like to thank: Mathias Gaunard, - Robert Stewart, Joël Lamotte, Lars Viklund, Nathan Ridge, Artyom Beilis, Joshua - Boyce, Gottlob Frege, Thomas Heller, Edward Diener, Dave Abrahams, Iain Denniston, - Dan Price, Ioannis Papadopoulos, and Robert Ramey. And thanks to Joel Falcou - for managing the review of this library. + Robert Stewart, Jo��l Lamotte, Lars Viklund, Nathan Ridge, Artyom Beilis, + Joshua Boyce, Gottlob Frege, Thomas Heller, Edward Diener, Dave Abrahams, Iain + Denniston, Dan Price, Ioannis Papadopoulos, and Robert Ramey. And thanks to + Joel Falcou for managing the review of this library.

diff --git a/doc/html/predef/adding_new_predefs.html b/doc/html/predef/adding_new_predefs.html index 091b7b7..37f49d4 100644 --- a/doc/html/predef/adding_new_predefs.html +++ b/doc/html/predef/adding_new_predefs.html @@ -4,8 +4,8 @@ Adding new predefs - - + + diff --git a/doc/html/predef/history.html b/doc/html/predef/history.html index 9d9a2ef..384339c 100644 --- a/doc/html/predef/history.html +++ b/doc/html/predef/history.html @@ -4,8 +4,8 @@ History - - + + @@ -19,6 +19,19 @@

+ 1.2 +

+
+

+ 1.1

+ BOOST_OS_HAIKU +
+

+ Haiku + operating system. +

+
++++ + + + + + + + + +
+

+ Symbol +

+ 		+

+ Version +

+
+

+ __HAIKU__ +

+ 		+

+ detection +

+
+
+ BOOST_OS_HPUX

@@ -479,7 +517,7 @@

- + BOOST_OS_IOS

@@ -554,7 +592,7 @@

- + BOOST_OS_IRIX

@@ -605,7 +643,7 @@

- + BOOST_OS_LINUX

@@ -656,7 +694,7 @@

- + BOOST_OS_MACOS

@@ -756,7 +794,7 @@

- + BOOST_OS_OS400

@@ -794,7 +832,7 @@

- + BOOST_OS_QNX

@@ -871,7 +909,7 @@

- + BOOST_OS_SOLARIS

@@ -923,7 +961,7 @@

- + BOOST_OS_UNIX

@@ -999,7 +1037,7 @@

- + BOOST_OS_SVR4

@@ -1075,7 +1113,7 @@

- + BOOST_OS_VMS

@@ -1138,7 +1176,7 @@

- + BOOST_OS_WINDOWS

@@ -1226,7 +1264,7 @@

- + BOOST_OS_BSD_BSDI

@@ -1264,7 +1302,7 @@

- + BOOST_OS_BSD_DRAGONFLY

@@ -1302,7 +1340,7 @@

- + BOOST_OS_BSD_FREE

@@ -1354,7 +1392,7 @@

- + BOOST_OS_BSD_NET

@@ -1466,7 +1504,7 @@

- + BOOST_OS_BSD_OPEN

diff --git a/doc/html/predef/reference/boost_plat_platform_macros.html b/doc/html/predef/reference/boost_plat_platform_macros.html index e554c77..9321e06 100644 --- a/doc/html/predef/reference/boost_plat_platform_macros.html +++ b/doc/html/predef/reference/boost_plat_platform_macros.html @@ -4,7 +4,7 @@ BOOST_PLAT platform macros - + diff --git a/doc/html/predef/reference/other_macros.html b/doc/html/predef/reference/other_macros.html index b1e3f6f..802f689 100644 --- a/doc/html/predef/reference/other_macros.html +++ b/doc/html/predef/reference/other_macros.html @@ -4,7 +4,7 @@ Other macros - + diff --git a/doc/html/predef/reference/version_definition_macros.html b/doc/html/predef/reference/version_definition_macros.html index c52ae47..8e70c48 100644 --- a/doc/html/predef/reference/version_definition_macros.html +++ b/doc/html/predef/reference/version_definition_macros.html @@ -4,7 +4,7 @@ Version definition macros - + diff --git a/doc/html/predef/to_do.html b/doc/html/predef/to_do.html index 200e3ce..c5f8252 100644 --- a/doc/html/predef/to_do.html +++ b/doc/html/predef/to_do.html @@ -4,8 +4,8 @@ To Do - - + + diff --git a/doc/html/predef/using_the_predefs.html b/doc/html/predef/using_the_predefs.html index 7ce9d04..c659ce6 100644 --- a/doc/html/predef/using_the_predefs.html +++ b/doc/html/predef/using_the_predefs.html @@ -4,8 +4,8 @@ Using the predefs - - + + diff --git a/doc/predef.qbk b/doc/predef.qbk index 75ec39d..e8b5f9d 100644 --- a/doc/predef.qbk +++ b/doc/predef.qbk @@ -1,6 +1,6 @@ [article Predef [quickbook 1.7] - [version 1.1] + [version 1.2] [authors [Rivera, Rene]] [copyright 2005, 2008-2014 Rene Rivera] [purpose Identification and specification of predefined macros.] @@ -576,7 +576,7 @@ This library would be an incoherent mess if it weren't for Boost community that provided invaluable feedback for the eight years that it took to polish into a useable form. In particular I would like to thank: Mathias Gaunard, -Robert Stewart, Joël Lamotte, Lars Viklund, Nathan Ridge, +Robert Stewart, Jo��l Lamotte, Lars Viklund, Nathan Ridge, Artyom Beilis, Joshua Boyce, Gottlob Frege, Thomas Heller, Edward Diener, Dave Abrahams, Iain Denniston, Dan Price, Ioannis Papadopoulos, and Robert Ramey. And thanks to diff --git a/include/boost/predef/os/haiku.h b/include/boost/predef/os/haiku.h index 2748ed2..4d741cf 100644 --- a/include/boost/predef/os/haiku.h +++ b/include/boost/predef/os/haiku.h @@ -1,5 +1,6 @@ /* Copyright Jessica Hamilton 2014 +Copyright Rene Rivera 2014 Distributed under 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) @@ -23,7 +24,7 @@ http://www.boost.org/LICENSE_1_0.txt) ] */ -#define BOOST_OS_BEOS BOOST_VERSION_NUMBER_NOT_AVAILABLE +#define BOOST_OS_HAIKU BOOST_VERSION_NUMBER_NOT_AVAILABLE #if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \ defined(__HAIKU__) \ diff --git a/include/boost/predef/version.h b/include/boost/predef/version.h index 1e85df7..0439b2c 100644 --- a/include/boost/predef/version.h +++ b/include/boost/predef/version.h @@ -10,6 +10,6 @@ http://www.boost.org/LICENSE_1_0.txt) #include -#define BOOST_PREDEF_VERSION BOOST_VERSION_NUMBER(1,1,0) +#define BOOST_PREDEF_VERSION BOOST_VERSION_NUMBER(1,2,0) #endif