Subject: [Boost-commit] svn:boost r86315 - in branches/release: . boost boost/predef boost/predef/detail boost/predef/os boost/predef/os/bsd boost/predef/other libs libs/predef libs/predef/doc libs/predef/doc/html libs/predef/doc/html/predef libs/predef/test
From: grafikrobot_at_[hidden]
Date: 2013-10-15 01:23:53
Author: grafik
Date: 2013-10-15 01:23:53 EDT (Tue, 15 Oct 2013)
New Revision: 86315
URL: http://svn.boost.org/trac/boost/changeset/86315
Log:
Merge of various bug fixes dealing with mis-detection of BSD on OSX. Fix some documentation typos.
Added:
branches/release/boost/predef/detail/os_detected.h
- copied unchanged from r86167, trunk/boost/predef/detail/os_detected.h
branches/release/libs/predef/test/macos_endian.c
- copied, changed from r86167, trunk/libs/predef/test/macos_endian.c
branches/release/libs/predef/test/macos_vs_bsd.c
- copied, changed from r86167, trunk/libs/predef/test/macos_vs_bsd.c
Properties modified:
branches/release/ (props changed)
branches/release/boost/ (props changed)
branches/release/boost/predef/ (props changed)
branches/release/libs/ (props changed)
branches/release/libs/predef/ (props changed)
Text files modified:
branches/release/boost/predef/detail/os_detected.h | 10 ++
branches/release/boost/predef/os/aix.h | 5 +
branches/release/boost/predef/os/amigaos.h | 5 +
branches/release/boost/predef/os/android.h | 5 +
branches/release/boost/predef/os/beos.h | 5 +
branches/release/boost/predef/os/bsd.h | 36 ++++++---
branches/release/boost/predef/os/bsd/bsdi.h | 8 +
branches/release/boost/predef/os/bsd/dragonfly.h | 8 +
branches/release/boost/predef/os/bsd/free.h | 8 +
branches/release/boost/predef/os/bsd/net.h | 8 +
branches/release/boost/predef/os/bsd/open.h | 8 +
branches/release/boost/predef/os/cygwin.h | 5 +
branches/release/boost/predef/os/hpux.h | 5 +
branches/release/boost/predef/os/irix.h | 5 +
branches/release/boost/predef/os/linux.h | 5 +
branches/release/boost/predef/os/macos.h | 7 +
branches/release/boost/predef/os/os400.h | 5 +
branches/release/boost/predef/os/qnxnto.h | 5 +
branches/release/boost/predef/os/solaris.h | 5 +
branches/release/boost/predef/os/unix.h | 7 +
branches/release/boost/predef/os/vms.h | 5 +
branches/release/boost/predef/os/windows.h | 7 +
branches/release/boost/predef/other/endian.h | 16 +++-
branches/release/libs/predef/doc/html/boostbook.css | 142 +++++++++++++++++++++++++++------------
branches/release/libs/predef/doc/html/index.html | 2
branches/release/libs/predef/doc/html/predef/acknoledgements.html | 4
branches/release/libs/predef/doc/html/predef/adding_new_predefs.html | 6
branches/release/libs/predef/doc/predef.qbk | 6
branches/release/libs/predef/test/build.jam | 25 +++++-
branches/release/libs/predef/test/macos_endian.c | 5
branches/release/libs/predef/test/macos_vs_bsd.c | 9 +-
branches/release/libs/predef/test/make.cpp | 4
32 files changed, 275 insertions(+), 111 deletions(-)
Copied: branches/release/boost/predef/detail/os_detected.h (from r86167, trunk/boost/predef/detail/os_detected.h)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/release/boost/predef/detail/os_detected.h 2013-10-15 01:23:53 EDT (Tue, 15 Oct 2013) (r86315, copy of r86167, trunk/boost/predef/detail/os_detected.h)
@@ -0,0 +1,10 @@
+/*
+Copyright Redshift Software, Inc. 2013
+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)
+*/
+
+#ifndef BOOST_PREDEF_DETAIL_OS_DETECTED
+#define BOOST_PREDEF_DETAIL_OS_DETECTED 1
+#endif
Modified: branches/release/boost/predef/os/aix.h
==============================================================================
--- branches/release/boost/predef/os/aix.h Tue Oct 15 00:44:00 2013 (r86314)
+++ branches/release/boost/predef/os/aix.h 2013-10-15 01:23:53 EDT (Tue, 15 Oct 2013) (r86315)
@@ -32,7 +32,9 @@
#define BOOST_OS_AIX BOOST_VERSION_NUMBER_NOT_AVAILABLE
-#if defined(_AIX) || defined(__TOS_AIX__)
+#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
+ defined(_AIX) || defined(__TOS_AIX__) \
+ )
# undef BOOST_OS_AIX
# if !defined(BOOST_OS_AIX) && defined(_AIX43)
# define BOOST_OS_AIX BOOST_VERSION_NUMBER(4,3,0)
@@ -53,6 +55,7 @@
#if BOOST_OS_AIX
# define BOOST_OS_AIX_AVAILABLE
+# include <boost/predef/detail/os_detected.h>
#endif
#define BOOST_OS_AIX_NAME "IBM AIX"
Modified: branches/release/boost/predef/os/amigaos.h
==============================================================================
--- branches/release/boost/predef/os/amigaos.h Tue Oct 15 00:44:00 2013 (r86314)
+++ branches/release/boost/predef/os/amigaos.h 2013-10-15 01:23:53 EDT (Tue, 15 Oct 2013) (r86315)
@@ -26,13 +26,16 @@
#define BOOST_OS_AMIGAOS BOOST_VERSION_NUMBER_NOT_AVAILABLE
-#if defined(AMIGA) || defined(__amigaos__)
+#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
+ defined(AMIGA) || defined(__amigaos__) \
+ )
# undef BOOST_OS_AMIGAOS
# define BOOST_OS_AMIGAOS BOOST_VERSION_NUMBER_AVAILABLE
#endif
#if BOOST_OS_AMIGAOS
# define BOOST_OS_AMIGAOS_AVAILABLE
+# include <boost/predef/detail/os_detected.h>
#endif
#define BOOST_OS_AMIGAOS_NAME "AmigaOS"
Modified: branches/release/boost/predef/os/android.h
==============================================================================
--- branches/release/boost/predef/os/android.h Tue Oct 15 00:44:00 2013 (r86314)
+++ branches/release/boost/predef/os/android.h 2013-10-15 01:23:53 EDT (Tue, 15 Oct 2013) (r86315)
@@ -25,13 +25,16 @@
#define BOOST_OS_ANDROID BOOST_VERSION_NUMBER_NOT_AVAILABLE
-#if defined(__ANDROID__)
+#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
+ defined(__ANDROID__) \
+ )
# undef BOOST_OS_ANDROID
# define BOOST_OS_ANDROID BOOST_VERSION_NUMBER_AVAILABLE
#endif
#if BOOST_OS_ANDROID
# define BOOST_OS_ANDROID_AVAILABLE
+# include <boost/predef/detail/os_detected.h>
#endif
#define BOOST_OS_ANDROID_NAME "Android"
Modified: branches/release/boost/predef/os/beos.h
==============================================================================
--- branches/release/boost/predef/os/beos.h Tue Oct 15 00:44:00 2013 (r86314)
+++ branches/release/boost/predef/os/beos.h 2013-10-15 01:23:53 EDT (Tue, 15 Oct 2013) (r86315)
@@ -25,13 +25,16 @@
#define BOOST_OS_BEOS BOOST_VERSION_NUMBER_NOT_AVAILABLE
-#if defined(__BEOS__)
+#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
+ defined(__BEOS__) \
+ )
# undef BOOST_OS_BEOS
# define BOOST_OS_BEOS BOOST_VERSION_NUMBER_AVAILABLE
#endif
#if BOOST_OS_BEOS
# define BOOST_OS_BEOS_AVAILABLE
+# include <boost/predef/detail/os_detected.h>
#endif
#define BOOST_OS_BEOS_NAME "BeOS"
Modified: branches/release/boost/predef/os/bsd.h
==============================================================================
--- branches/release/boost/predef/os/bsd.h Tue Oct 15 00:44:00 2013 (r86314)
+++ branches/release/boost/predef/os/bsd.h 2013-10-15 01:23:53 EDT (Tue, 15 Oct 2013) (r86315)
@@ -8,6 +8,13 @@
#ifndef BOOST_PREDEF_OS_BSD_H
#define BOOST_PREDEF_OS_BSD_H
+/* Special case: OSX will define BSD predefs if the sys/param.h
+ * header is included. We can guard against that, but only if we
+ * detect OSX first. Hence we will force include OSX detection
+ * before doing any BSD detection.
+ */
+#include <boost/predef/os/macos.h>
+
#include <boost/predef/version_number.h>
#include <boost/predef/make.h>
@@ -42,20 +49,30 @@
]
*/
+#include <boost/predef/os/bsd/bsdi.h>
+#include <boost/predef/os/bsd/dragonfly.h>
+#include <boost/predef/os/bsd/free.h>
+#include <boost/predef/os/bsd/open.h>
+#include <boost/predef/os/bsd/net.h>
+
+#ifndef BOOST_OS_BSD
#define BOOST_OS_BSD BOOST_VERSION_NUMBER_NOT_AVAILABLE
+#endif
-#if defined(BSD) || \
- defined(_SYSTYPE_BSD)
+#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
+ defined(BSD) || \
+ defined(_SYSTYPE_BSD) \
+ )
# undef BOOST_OS_BSD
# include <sys/param.h>
-# if !defined(BOOST_OS_BSD) && defined(BSD4_2)
-# define BOOST_OS_BSD BOOST_VERSION_NUMBER(4,2,0)
+# if !defined(BOOST_OS_BSD) && defined(BSD4_4)
+# define BOOST_OS_BSD BOOST_VERSION_NUMBER(4,4,0)
# endif
# if !defined(BOOST_OS_BSD) && defined(BSD4_3)
# define BOOST_OS_BSD BOOST_VERSION_NUMBER(4,3,0)
# endif
-# if !defined(BOOST_OS_BSD) && defined(BSD4_4)
-# define BOOST_OS_BSD BOOST_VERSION_NUMBER(4,4,0)
+# if !defined(BOOST_OS_BSD) && defined(BSD4_2)
+# define BOOST_OS_BSD BOOST_VERSION_NUMBER(4,2,0)
# endif
# if !defined(BOOST_OS_BSD) && defined(BSD)
# define BOOST_OS_BSD BOOST_PREDEF_MAKE_10_VVRR(BSD)
@@ -67,6 +84,7 @@
#if BOOST_OS_BSD
# define BOOST_OS_BSD_AVAILABLE
+# include <boost/predef/detail/os_detected.h>
#endif
#define BOOST_OS_BSD_NAME "BSD"
@@ -74,10 +92,4 @@
#include <boost/predef/detail/test.h>
BOOST_PREDEF_DECLARE_TEST(BOOST_OS_BSD,BOOST_OS_BSD_NAME)
-#include <boost/predef/os/bsd/bsdi.h>
-#include <boost/predef/os/bsd/dragonfly.h>
-#include <boost/predef/os/bsd/free.h>
-#include <boost/predef/os/bsd/open.h>
-#include <boost/predef/os/bsd/net.h>
-
#endif
Modified: branches/release/boost/predef/os/bsd/bsdi.h
==============================================================================
--- branches/release/boost/predef/os/bsd/bsdi.h Tue Oct 15 00:44:00 2013 (r86314)
+++ branches/release/boost/predef/os/bsd/bsdi.h 2013-10-15 01:23:53 EDT (Tue, 15 Oct 2013) (r86315)
@@ -24,9 +24,12 @@
#define BOOST_OS_BSD_BSDI BOOST_VERSION_NUMBER_NOT_AVAILABLE
-#if defined(__bsdi__)
-# ifndef BOOST_OS_BSD
+#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
+ defined(__bsdi__) \
+ )
+# ifndef BOOST_OS_BSD_AVAILABLE
# define BOOST_OS_BSD BOOST_VERSION_NUMBER_AVAILABLE
+# define BOOST_OS_BSD_AVAILABLE
# endif
# undef BOOST_OS_BSD_BSDI
# define BOOST_OS_BSD_BSDI BOOST_VERSION_NUMBER_AVAILABLE
@@ -34,6 +37,7 @@
#if BOOST_OS_BSD_BSDI
# define BOOST_OS_BSD_BSDI_AVAILABLE
+# include <boost/predef/detail/os_detected.h>
#endif
#define BOOST_OS_BSD_BSDI_NAME "BSDi BSD/OS"
Modified: branches/release/boost/predef/os/bsd/dragonfly.h
==============================================================================
--- branches/release/boost/predef/os/bsd/dragonfly.h Tue Oct 15 00:44:00 2013 (r86314)
+++ branches/release/boost/predef/os/bsd/dragonfly.h 2013-10-15 01:23:53 EDT (Tue, 15 Oct 2013) (r86315)
@@ -24,9 +24,12 @@
#define BOOST_OS_BSD_DRAGONFLY BOOST_VERSION_NUMBER_NOT_AVAILABLE
-#if defined(__DragonFly__)
-# ifndef BOOST_OS_BSD
+#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
+ defined(__DragonFly__) \
+ )
+# ifndef BOOST_OS_BSD_AVAILABLE
# define BOOST_OS_BSD BOOST_VERSION_NUMBER_AVAILABLE
+# define BOOST_OS_BSD_AVAILABLE
# endif
# undef BOOST_OS_BSD_DRAGONFLY
# if defined(__DragonFly__)
@@ -36,6 +39,7 @@
#if BOOST_OS_BSD_DRAGONFLY
# define BOOST_OS_BSD_DRAGONFLY_AVAILABLE
+# include <boost/predef/detail/os_detected.h>
#endif
#define BOOST_OS_BSD_DRAGONFLY_NAME "DragonFly BSD"
Modified: branches/release/boost/predef/os/bsd/free.h
==============================================================================
--- branches/release/boost/predef/os/bsd/free.h Tue Oct 15 00:44:00 2013 (r86314)
+++ branches/release/boost/predef/os/bsd/free.h 2013-10-15 01:23:53 EDT (Tue, 15 Oct 2013) (r86315)
@@ -26,9 +26,12 @@
#define BOOST_OS_BSD_FREE BOOST_VERSION_NUMBER_NOT_AVAILABLE
-#if defined(__FreeBSD__)
-# ifndef BOOST_OS_BSD
+#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
+ defined(__FreeBSD__) \
+ )
+# ifndef BOOST_OS_BSD_AVAILABLE
# define BOOST_OS_BSD BOOST_VERSION_NUMBER_AVAILABLE
+# define BOOST_OS_BSD_AVAILABLE
# endif
# undef BOOST_OS_BSD_FREE
# if defined(__FreeBSD_version)
@@ -46,6 +49,7 @@
#if BOOST_OS_BSD_FREE
# define BOOST_OS_BSD_FREE_AVAILABLE
+# include <boost/predef/detail/os_detected.h>
#endif
#define BOOST_OS_BSD_FREE_NAME "Free BSD"
Modified: branches/release/boost/predef/os/bsd/net.h
==============================================================================
--- branches/release/boost/predef/os/bsd/net.h Tue Oct 15 00:44:00 2013 (r86314)
+++ branches/release/boost/predef/os/bsd/net.h 2013-10-15 01:23:53 EDT (Tue, 15 Oct 2013) (r86315)
@@ -31,9 +31,12 @@
#define BOOST_OS_BSD_NET BOOST_VERSION_NUMBER_NOT_AVAILABLE
-#if defined(__NETBSD__) || defined(__NetBSD__)
-# ifndef BOOST_OS_BSD
+#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
+ defined(__NETBSD__) || defined(__NetBSD__) \
+ )
+# ifndef BOOST_OS_BSD_AVAILABLE
# define BOOST_OS_BSD BOOST_VERSION_NUMBER_AVAILABLE
+# define BOOST_OS_BSD_AVAILABLE
# endif
# undef BOOST_OS_BSD_NET
# if defined(__NETBSD__)
@@ -70,6 +73,7 @@
#if BOOST_OS_BSD_NET
# define BOOST_OS_BSD_NET_AVAILABLE
+# include <boost/predef/detail/os_detected.h>
#endif
#define BOOST_OS_BSD_NET_NAME "DragonFly BSD"
Modified: branches/release/boost/predef/os/bsd/open.h
==============================================================================
--- branches/release/boost/predef/os/bsd/open.h Tue Oct 15 00:44:00 2013 (r86314)
+++ branches/release/boost/predef/os/bsd/open.h 2013-10-15 01:23:53 EDT (Tue, 15 Oct 2013) (r86315)
@@ -55,9 +55,12 @@
#define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER_NOT_AVAILABLE
-#if defined(__OpenBSD__)
-# ifndef BOOST_OS_BSD
+#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
+ defined(__OpenBSD__) \
+ )
+# ifndef BOOST_OS_BSD_AVAILABLE
# define BOOST_OS_BSD BOOST_VERSION_NUMBER_AVAILABLE
+# define BOOST_OS_BSD_AVAILABLE
# endif
# undef BOOST_OS_BSD_OPEN
# if !defined(BOOST_OS_BSD_OPEN) && defined(OpenBSD2_0)
@@ -157,6 +160,7 @@
#if BOOST_OS_BSD_OPEN
# define BOOST_OS_BSD_OPEN_AVAILABLE
+# include <boost/predef/detail/os_detected.h>
#endif
#define BOOST_OS_BSD_OPEN_NAME "OpenBSD"
Modified: branches/release/boost/predef/os/cygwin.h
==============================================================================
--- branches/release/boost/predef/os/cygwin.h Tue Oct 15 00:44:00 2013 (r86314)
+++ branches/release/boost/predef/os/cygwin.h 2013-10-15 01:23:53 EDT (Tue, 15 Oct 2013) (r86315)
@@ -25,13 +25,16 @@
#define BOOST_OS_CYGWIN BOOST_VERSION_NUMBER_NOT_AVAILABLE
-#if defined(__CYGWIN__)
+#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
+ defined(__CYGWIN__) \
+ )
# undef BOOST_OS_CYGWIN
# define BOOST_OS_CGYWIN BOOST_VERSION_NUMBER_AVAILABLE
#endif
#if BOOST_OS_CYGWIN
# define BOOST_OS_CYGWIN_AVAILABLE
+# include <boost/predef/detail/os_detected.h>
#endif
#define BOOST_OS_CYGWIN_NAME "Cygwin"
Modified: branches/release/boost/predef/os/hpux.h
==============================================================================
--- branches/release/boost/predef/os/hpux.h Tue Oct 15 00:44:00 2013 (r86314)
+++ branches/release/boost/predef/os/hpux.h 2013-10-15 01:23:53 EDT (Tue, 15 Oct 2013) (r86315)
@@ -27,13 +27,16 @@
#define BOOST_OS_HPUX BOOST_VERSION_NUMBER_NOT_AVAILABLE
-#if defined(hpux) || defined(_hpux) || defined(__hpux)
+#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
+ defined(hpux) || defined(_hpux) || defined(__hpux) \
+ )
# undef BOOST_OS_HPUX
# define BOOST_OS_HPUX BOOST_VERSION_NUMBER_AVAILABLE
#endif
#if BOOST_OS_HPUX
# define BOOST_OS_HPUX_AVAILABLE
+# include <boost/predef/detail/os_detected.h>
#endif
#define BOOST_OS_HPUX_NAME "HP-UX"
Modified: branches/release/boost/predef/os/irix.h
==============================================================================
--- branches/release/boost/predef/os/irix.h Tue Oct 15 00:44:00 2013 (r86314)
+++ branches/release/boost/predef/os/irix.h 2013-10-15 01:23:53 EDT (Tue, 15 Oct 2013) (r86315)
@@ -26,13 +26,16 @@
#define BOOST_OS_IRIX BOOST_VERSION_NUMBER_NOT_AVAILABLE
-#if defined(sgi) || defined(__sgi)
+#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
+ defined(sgi) || defined(__sgi) \
+ )
# undef BOOST_OS_IRIX
# define BOOST_OS_IRIX BOOST_VERSION_NUMBER_AVAILABLE
#endif
#if BOOST_OS_IRIX
# define BOOST_OS_IRIX_AVAILABLE
+# include <boost/predef/detail/os_detected.h>
#endif
#define BOOST_OS_IRIX_NAME "IRIX"
Modified: branches/release/boost/predef/os/linux.h
==============================================================================
--- branches/release/boost/predef/os/linux.h Tue Oct 15 00:44:00 2013 (r86314)
+++ branches/release/boost/predef/os/linux.h 2013-10-15 01:23:53 EDT (Tue, 15 Oct 2013) (r86315)
@@ -26,13 +26,16 @@
#define BOOST_OS_LINUX BOOST_VERSION_NUMBER_NOT_AVAILABLE
-#if defined(linux) || defined(__linux)
+#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
+ defined(linux) || defined(__linux) \
+ )
# undef BOOST_OS_LINUX
# define BOOST_OS_LINUX BOOST_VERSION_NUMBER_AVAILABLE
#endif
#if BOOST_OS_LINUX
# define BOOST_OS_LINUX_AVAILABLE
+# include <boost/predef/detail/os_detected.h>
#endif
#define BOOST_OS_LINUX_NAME "Linux"
Modified: branches/release/boost/predef/os/macos.h
==============================================================================
--- branches/release/boost/predef/os/macos.h Tue Oct 15 00:44:00 2013 (r86314)
+++ branches/release/boost/predef/os/macos.h 2013-10-15 01:23:53 EDT (Tue, 15 Oct 2013) (r86315)
@@ -31,8 +31,10 @@
#define BOOST_OS_MACOS BOOST_VERSION_NUMBER_NOT_AVAILABLE
-#if defined(macintosh) || defined(Macintosh) || \
- (defined(__APPLE__) && defined(__MACH__))
+#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
+ defined(macintosh) || defined(Macintosh) || \
+ (defined(__APPLE__) && defined(__MACH__)) \
+ )
# undef BOOST_OS_MACOS
# if !defined(BOOST_OS_MACOS) && defined(__APPLE__) && defined(__MACH__)
# define BOOST_OS_MACOS BOOST_VERSION_NUMBER(10,0,0)
@@ -44,6 +46,7 @@
#if BOOST_OS_MACOS
# define BOOST_OS_MACOS_AVAILABLE
+# include <boost/predef/detail/os_detected.h>
#endif
#define BOOST_OS_MACOS_NAME "Mac OS"
Modified: branches/release/boost/predef/os/os400.h
==============================================================================
--- branches/release/boost/predef/os/os400.h Tue Oct 15 00:44:00 2013 (r86314)
+++ branches/release/boost/predef/os/os400.h 2013-10-15 01:23:53 EDT (Tue, 15 Oct 2013) (r86315)
@@ -25,13 +25,16 @@
#define BOOST_OS_OS400 BOOST_VERSION_NUMBER_NOT_AVAILABLE
-#if defined(__OS400__)
+#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
+ defined(__OS400__) \
+ )
# undef BOOST_OS_OS400
# define BOOST_OS_OS400 BOOST_VERSION_NUMBER_AVAILABLE
#endif
#if BOOST_OS_OS400
# define BOOST_OS_OS400_AVAILABLE
+# include <boost/predef/detail/os_detected.h>
#endif
#define BOOST_OS_OS400_NAME "IBM OS/400"
Modified: branches/release/boost/predef/os/qnxnto.h
==============================================================================
--- branches/release/boost/predef/os/qnxnto.h Tue Oct 15 00:44:00 2013 (r86314)
+++ branches/release/boost/predef/os/qnxnto.h 2013-10-15 01:23:53 EDT (Tue, 15 Oct 2013) (r86315)
@@ -31,7 +31,9 @@
#define BOOST_OS_QNX BOOST_VERSION_NUMBER_NOT_AVAILABLE
-#if defined(__QNX__) || defined(__QNXNTO__)
+#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
+ defined(__QNX__) || defined(__QNXNTO__) \
+ )
# undef BOOST_OS_QNX
# if !defined(BOOST_OS_QNX) && defined(_NTO_VERSION)
# define BOOST_OS_QNX BOOST_PREDEF_MAKE_10_VVRR(_NTO_VERSION)
@@ -46,6 +48,7 @@
#if BOOST_OS_QNX
# define BOOST_OS_QNX_AVAILABLE
+# include <boost/predef/detail/os_detected.h>
#endif
#define BOOST_OS_QNX_NAME "QNX"
Modified: branches/release/boost/predef/os/solaris.h
==============================================================================
--- branches/release/boost/predef/os/solaris.h Tue Oct 15 00:44:00 2013 (r86314)
+++ branches/release/boost/predef/os/solaris.h 2013-10-15 01:23:53 EDT (Tue, 15 Oct 2013) (r86315)
@@ -26,13 +26,16 @@
#define BOOST_OS_SOLARIS BOOST_VERSION_NUMBER_NOT_AVAILABLE
-#if defined(sun) || defined(__sun)
+#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
+ defined(sun) || defined(__sun) \
+ )
# undef BOOST_OS_SOLARIS
# define BOOST_OS_SOLARIS BOOST_VERSION_NUMBER_AVAILABLE
#endif
#if BOOST_OS_SOLARIS
# define BOOST_OS_SOLARIS_AVAILABLE
+# include <boost/predef/detail/os_detected.h>
#endif
#define BOOST_OS_SOLARIS_NAME "Solaris"
Modified: branches/release/boost/predef/os/unix.h
==============================================================================
--- branches/release/boost/predef/os/unix.h Tue Oct 15 00:44:00 2013 (r86314)
+++ branches/release/boost/predef/os/unix.h 2013-10-15 01:23:53 EDT (Tue, 15 Oct 2013) (r86315)
@@ -28,14 +28,17 @@
#define BOOST_OS_UNIX BOOST_VERSION_NUMBER_NOT_AVAILABLE
-#if defined(unix) || defined(__unix) || \
- defined(_XOPEN_SOURCE) || defined(_POSIX_SOURCE)
+#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
+ defined(unix) || defined(__unix) || \
+ defined(_XOPEN_SOURCE) || defined(_POSIX_SOURCE) \
+ )
# undef BOOST_OS_UNIX
# define BOOST_OS_UNIX BOOST_VERSION_NUMBER_AVAILABLE
#endif
#if BOOST_OS_UNIX
# define BOOST_OS_UNIX_AVAILABLE
+# include <boost/predef/detail/os_detected.h>
#endif
#define BOOST_OS_UNIX_NAME "Unix Environment"
Modified: branches/release/boost/predef/os/vms.h
==============================================================================
--- branches/release/boost/predef/os/vms.h Tue Oct 15 00:44:00 2013 (r86314)
+++ branches/release/boost/predef/os/vms.h 2013-10-15 01:23:53 EDT (Tue, 15 Oct 2013) (r86315)
@@ -28,7 +28,9 @@
#define BOOST_OS_VMS BOOST_VERSION_NUMBER_NOT_AVAILABLE
-#if defined(VMS) || defined(__VMS)
+#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
+ defined(VMS) || defined(__VMS) \
+ )
# undef BOOST_OS_VMS
# if defined(__VMS_VER)
# define BOOST_OS_VMS BOOST_PREDEF_MAKE_10_VVRR00PP00(__VMS_VER)
@@ -39,6 +41,7 @@
#if BOOST_OS_VMS
# define BOOST_OS_VMS_AVAILABLE
+# include <boost/predef/detail/os_detected.h>
#endif
#define BOOST_OS_VMS_NAME "VMS"
Modified: branches/release/boost/predef/os/windows.h
==============================================================================
--- branches/release/boost/predef/os/windows.h Tue Oct 15 00:44:00 2013 (r86314)
+++ branches/release/boost/predef/os/windows.h 2013-10-15 01:23:53 EDT (Tue, 15 Oct 2013) (r86315)
@@ -29,15 +29,18 @@
#define BOOST_OS_WINDOWS BOOST_VERSION_NUMBER_NOT_AVAILABLE
-#if defined(_WIN32) || defined(_WIN64) || \
+#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
+ defined(_WIN32) || defined(_WIN64) || \
defined(__WIN32__) || defined(__TOS_WIN__) || \
- defined(__WINDOWS__)
+ defined(__WINDOWS__) \
+ )
# undef BOOST_OS_WINDOWS
# define BOOST_OS_WINDOWS BOOST_VERSION_NUMBER_AVAILABLE
#endif
#if BOOST_OS_WINDOWS
# define BOOST_OS_WINDOWS_AVAILABLE
+# include <boost/predef/detail/os_detected.h>
#endif
#define BOOST_OS_WINDOWS_NAME "Microsoft Windows"
Modified: branches/release/boost/predef/other/endian.h
==============================================================================
--- branches/release/boost/predef/other/endian.h Tue Oct 15 00:44:00 2013 (r86314)
+++ branches/release/boost/predef/other/endian.h 2013-10-15 01:23:53 EDT (Tue, 15 Oct 2013) (r86315)
@@ -11,6 +11,7 @@
#include <boost/predef/version_number.h>
#include <boost/predef/make.h>
#include <boost/predef/library/c/gnu.h>
+#include <boost/predef/os/macos.h>
#include <boost/predef/os/bsd.h>
/*`
@@ -48,17 +49,22 @@
#define BOOST_ENDIAN_LITTLE_WORD BOOST_VERSION_NUMBER_NOT_AVAILABLE
/* GNU libc provides a header defining __BYTE_ORDER, or _BYTE_ORDER.
+ * And some OSs provide some for of endian header also.
*/
#if !BOOST_ENDIAN_BIG_BYTE && !BOOST_ENDIAN_BIG_WORD && \
!BOOST_ENDIAN_LITTLE_BYTE && !BOOST_ENDIAN_LITTLE_WORD
# if BOOST_LIB_C_GNU
# include <endian.h>
# else
-# if BOOST_OS_BSD
-# if BOOST_OS_BSD_OPEN
-# include <machine/endian.h>
-# else
-# include <sys/endian.h>
+# if BOOST_OS_MACOS
+# include <machine/endian.h>
+# else
+# if BOOST_OS_BSD
+# if BOOST_OS_BSD_OPEN
+# include <machine/endian.h>
+# else
+# include <sys/endian.h>
+# endif
# endif
# endif
# endif
Modified: branches/release/libs/predef/doc/html/boostbook.css
==============================================================================
--- branches/release/libs/predef/doc/html/boostbook.css Tue Oct 15 00:44:00 2013 (r86314)
+++ branches/release/libs/predef/doc/html/boostbook.css 2013-10-15 01:23:53 EDT (Tue, 15 Oct 2013) (r86315)
@@ -1,13 +1,17 @@
+
/*=============================================================================
- Copyright (c) 2004 Joel de Guzman
- http://spirit.sourceforge.net/
+Copyright (c) 2004 Joel de Guzman
+http://spirit.sourceforge.net/
+
+Copyright 2013 Niall Douglas additions for colors and alignment.
+Copyright 2013 Paul A. Bristow additions for more colors and alignments.
- Distributed under the Boost Software License, Version 1.0. (See accompany-
- ing file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+Distributed under the Boost Software License, Version 1.0. (See accompany-
+ing file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
=============================================================================*/
/*=============================================================================
- Body defaults
+Body defaults
=============================================================================*/
body
@@ -17,7 +21,7 @@
}
/*=============================================================================
- Paragraphs
+Paragraphs
=============================================================================*/
p
@@ -28,7 +32,7 @@
}
/*=============================================================================
- Program listings
+Program listings
=============================================================================*/
/* Code on paragraphs */
@@ -58,11 +62,11 @@
td .screen
{
margin: 0pc 0pc 0pc 0pc;
- padding: 0pc 0pc 0pc 0pc;
+ padding: 0pc 0pc 0pc 0pc;
}
/*=============================================================================
- Headings
+Headings
=============================================================================*/
h1, h2, h3, h4, h5, h6
@@ -116,13 +120,13 @@
h1 tt.computeroutput { font-size: 140% }
h2 tt.computeroutput { font-size: 140% }
h3 tt.computeroutput { font-size: 130% }
- h4 tt.computeroutput { font-size: 130% }
+ h4 tt.computeroutput { font-size: 130% }
h5 tt.computeroutput { font-size: 130% }
h6 tt.computeroutput { font-size: 130% }
/*=============================================================================
- Author
+Author
=============================================================================*/
h3.author
@@ -131,7 +135,7 @@
}
/*=============================================================================
- Lists
+Lists
=============================================================================*/
li
@@ -153,7 +157,7 @@
}
/*=============================================================================
- Links
+Links
=============================================================================*/
a
@@ -167,7 +171,7 @@
}
/*=============================================================================
- Spirit style navigation
+Spirit style navigation
=============================================================================*/
.spirit-nav
@@ -187,7 +191,7 @@
}
/*=============================================================================
- Copyright footer
+Copyright footer
=============================================================================*/
.copyright-footer
{
@@ -202,7 +206,7 @@
}
/*=============================================================================
- Table of contents
+Table of contents
=============================================================================*/
div.toc
@@ -218,7 +222,7 @@
float: right;
padding: 0.5pc;
}
-
+
/* Code on toc */
.toc .computeroutput { font-size: 120% }
@@ -227,7 +231,7 @@
.toc dl dl { margin: 0; }
/*=============================================================================
- Tables
+Tables
=============================================================================*/
.table-title,
@@ -286,7 +290,7 @@
}
/*=============================================================================
- Blurbs
+Blurbs
=============================================================================*/
div.note,
@@ -309,7 +313,7 @@
}
/*=============================================================================
- Variable Lists
+Variable Lists
=============================================================================*/
div.variablelist
@@ -354,7 +358,7 @@
}
/*=============================================================================
- Misc
+Misc
=============================================================================*/
/* Title of books and articles in bibliographies */
@@ -380,7 +384,7 @@
}
/*=============================================================================
- Colors
+Colors
=============================================================================*/
@media screen
@@ -391,16 +395,16 @@
}
/* Syntax Highlighting */
- .keyword { color: #0000AA; }
- .identifier { color: #000000; }
- .special { color: #707070; }
- .preprocessor { color: #402080; }
- .char { color: teal; }
- .comment { color: #800000; }
- .string { color: teal; }
- .number { color: teal; }
- .white_bkd { background-color: #FFFFFF; }
- .dk_grey_bkd { background-color: #999999; }
+ .keyword { color: #0000AA; }
+ .identifier { color: #000000; }
+ .special { color: #707070; }
+ .preprocessor { color: #402080; }
+ .char { color: teal; }
+ .comment { color: #800000; }
+ .string { color: teal; }
+ .number { color: teal; }
+ .white_bkd { background-color: #FFFFFF; }
+ .dk_grey_bkd { background-color: #999999; }
/* Links */
a, a .keyword, a .identifier, a .special, a .preprocessor
@@ -572,7 +576,7 @@
}
/*=============================================================================
- Images
+Images
=============================================================================*/
span.inlinemediaobject img
@@ -581,36 +585,36 @@
}
/*==============================================================================
- Super and Subscript: style so that line spacing isn't effected, see
- http://www.adobe.com/cfusion/communityengine/index.cfm?event=showdetails&productId=1&postId=5341
+Super and Subscript: style so that line spacing isn't effected, see
+http://www.adobe.com/cfusion/communityengine/index.cfm?event=showdetails&productId=1&postId=5341
==============================================================================*/
sup,
sub {
- height: 0;
- line-height: 1;
- vertical-align: baseline;
- position: relative;
-
+height: 0;
+line-height: 1;
+vertical-align: baseline;
+position: relative;
+
}
/* For internet explorer: */
* html sup,
* html sub {
- vertical-align: bottom;
+vertical-align: bottom;
}
sup {
- bottom: 1ex;
+bottom: 1ex;
}
sub {
- top: .5ex;
+top: .5ex;
}
/*==============================================================================
- Indexes: pretty much the same as the TOC.
+Indexes: pretty much the same as the TOC.
==============================================================================*/
.index
@@ -644,3 +648,53 @@
font-weight: bold;
}
+
+/*==============================================================================
+Alignment and coloring use 'role' feature, available from Quickbook 1.6 up.
+Added from Niall Douglas for role color and alignment.
+http://article.gmane.org/gmane.comp.lib.boost.devel/243318
+*/
+
+/* Add text alignment (see http://www.w3schools.com/cssref/pr_text_text-align.asp) */
+span.aligncenter
+{
+ display: inline-block; width: 100%; text-align: center;
+}
+span.alignright
+{
+ display: inline-block; width: 100%; text-align: right;
+}
+/* alignleft is the default. */
+span.alignleft
+{
+ display: inline-block; width: 100%; text-align: left;
+}
+
+/* alignjustify stretches the word spacing so that each line has equal width
+within a chosen fraction of page width (here arbitrarily 20%).
+*Not* useful inside table items as the column width remains the total string width.
+Nor very useful, except to temporarily restrict the width.
+*/
+span.alignjustify
+{
+ display: inline-block; width: 20%; text-align: justify;
+}
+
+/* Text colors.
+Names at http://www.w3.org/TR/2002/WD-css3-color-20020219/ 4.3. X11 color keywords.
+Quickbook Usage: [role red Some red text]
+
+*/
+span.red { inline-block; color: red; }
+span.green { color: green; }
+span.lime { color: #00FF00; }
+span.blue { color: blue; }
+span.navy { color: navy; }
+span.yellow { color: yellow; }
+span.magenta { color: magenta; }
+span.indigo { color: #4B0082; }
+span.cyan { color: cyan; }
+span.purple { color: purple; }
+span.gold { color: gold; }
+span.silver { color: silver; } /* lighter gray */
+span.gray { color: #808080; } /* light gray */
Modified: branches/release/libs/predef/doc/html/index.html
==============================================================================
--- branches/release/libs/predef/doc/html/index.html Tue Oct 15 00:44:00 2013 (r86314)
+++ branches/release/libs/predef/doc/html/index.html 2013-10-15 01:23:53 EDT (Tue, 15 Oct 2013) (r86315)
@@ -50,7 +50,7 @@
</div>
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"><p><small>Last revised: July 28, 2013 at 17:05:40 GMT</small></p></td>
+<td align="left"><p><small>Last revised: October 15, 2013 at 04:40:06 GMT</small></p></td>
<td align="right"><div class="copyright-footer"></div></td>
</tr></table>
<hr>
Modified: branches/release/libs/predef/doc/html/predef/acknoledgements.html
==============================================================================
--- branches/release/libs/predef/doc/html/predef/acknoledgements.html Tue Oct 15 00:44:00 2013 (r86314)
+++ branches/release/libs/predef/doc/html/predef/acknoledgements.html 2013-10-15 01:23:53 EDT (Tue, 15 Oct 2013) (r86315)
@@ -17,8 +17,8 @@
<a name="predef.acknoledgements"></a><a class="link" href="acknoledgements.html" title="Acknoledgements">Acknoledgements</a>
</h2></div></div></div>
<p>
- The comprehensiveness of this library would not be possible without the existance
- of the indispensible resource that is the <a href="http://sourceforge.net/p/predef/" target="_top">Pre-defined
+ The comprehensiveness of this library would not be possible without the existence
+ of the indispensable resource that is the <a href="http://sourceforge.net/p/predef/" target="_top">Pre-defined
C/C++ Compiler Macros</a> Project. It was, and continues to be, the primary
source of the definitions that make up this library. Thanks to Bjorn Reese
and all the volunteers that make that resource possible.
Modified: branches/release/libs/predef/doc/html/predef/adding_new_predefs.html
==============================================================================
--- branches/release/libs/predef/doc/html/predef/adding_new_predefs.html Tue Oct 15 00:44:00 2013 (r86314)
+++ branches/release/libs/predef/doc/html/predef/adding_new_predefs.html 2013-10-15 01:23:53 EDT (Tue, 15 Oct 2013) (r86315)
@@ -177,9 +177,9 @@
<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special"><</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">predef</span><span class="special">/</span><span class="identifier">make</span><span class="special">.</span><span class="identifier">h</span><span class="special">></span>
</pre>
<p>
- One will get a set of utlity macros to decompose common version macros as defined
- by compilers. For example the EDG compiler uses a simple 3-digit version macro
- (M,N,P). It can be decomesed and defined as:
+ One will get a set of utility macros to decompose common version macros as
+ defined by compilers. For example the EDG compiler uses a simple 3-digit version
+ macro (M,N,P). It can be decomposed and defined as:
</p>
<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_CCOMP_EDG</span> <span class="identifier">BOOST_PREDEF_MAKE_N_N_N</span><span class="special">(</span><span class="identifier">__EDG_VERSION__</span><span class="special">)</span>
</pre>
Modified: branches/release/libs/predef/doc/predef.qbk
==============================================================================
--- branches/release/libs/predef/doc/predef.qbk Tue Oct 15 00:44:00 2013 (r86314)
+++ branches/release/libs/predef/doc/predef.qbk 2013-10-15 01:23:53 EDT (Tue, 15 Oct 2013) (r86315)
@@ -398,9 +398,9 @@
#include <boost/predef/make.h>
``
-One will get a set of utlity macros to decompose common version
+One will get a set of utility macros to decompose common version
macros as defined by compilers. For example the EDG compiler
-uses a simple 3-digit version macro (M,N,P). It can be decomesed
+uses a simple 3-digit version macro (M,N,P). It can be decomposed
and defined as:
``
@@ -457,7 +457,7 @@
[section Acknoledgements]
The comprehensiveness of this library would not be
-possible without the existance of the indispensible
+possible without the existence of the indispensable
resource that is the
[@http://sourceforge.net/p/predef/ Pre-defined C/C++ Compiler Macros]
Project. It was, and continues to be, the primary source
Modified: branches/release/libs/predef/test/build.jam
==============================================================================
--- branches/release/libs/predef/test/build.jam Tue Oct 15 00:44:00 2013 (r86314)
+++ branches/release/libs/predef/test/build.jam 2013-10-15 01:23:53 EDT (Tue, 15 Oct 2013) (r86315)
@@ -4,19 +4,34 @@
# (See accompanying file LICENSE_1_0.txt or copy at
# http://www.boost.org/LICENSE_1_0.txt)
+local predef-include-root ;
+local predef-dependency ;
+
+# When using modular layout, header files are not present in $root/boost
+# unlink links are created, therefore instead of direct dependency on
+# a header, we need to use dependency on metatarget.
if $(BOOST_PREDEF_ROOT)
{
- path-constant BOOST_PREDEF_INCLUDE_ROOT : $(BOOST_PREDEF_ROOT)/include ;
+ predef-include-root = $(BOOST_PREDEF_ROOT)/include ;
+ predef-dependency = $(predef-include-root)/boost/predef.h ;
+}
+else if $(BOOST_MODULARLAYOUT)
+{
+ predef-include-root = $(BOOST_ROOT)/include ;
+ predef-dependency = /boost//predef-headers ;
}
else
{
- path-constant BOOST_PREDEF_INCLUDE_ROOT : $(BOOST_ROOT) ;
+ predef-include-root = $(BOOST_ROOT) ;
+ predef-dependency = $(predef-include-root)/boost/predef.h ;
}
project test
: requirements
- <include>$(BOOST_PREDEF_INCLUDE_ROOT)
- <dependency>$(BOOST_PREDEF_INCLUDE_ROOT)/boost/predef.h
+ <include>$(predef-include-root)
+ # Add explicit dependency since we don't have header scanner for
+ # .m and .mm files.
+ <dependency>$(predef-dependency)
;
using testing ;
@@ -28,4 +43,6 @@
[ run info_as_objc.m : : : <test-info>always_show_run_output ]
[ run version.cpp ]
[ run make.cpp ]
+ [ compile macos_endian.c ]
+ [ compile macos_vs_bsd.c ]
;
Copied and modified: branches/release/libs/predef/test/macos_endian.c (from r86167, trunk/libs/predef/test/macos_endian.c)
==============================================================================
--- trunk/libs/predef/test/macos_endian.c Sat Oct 5 17:50:45 2013 (r86167, copy source)
+++ branches/release/libs/predef/test/macos_endian.c 2013-10-15 01:23:53 EDT (Tue, 15 Oct 2013) (r86315)
@@ -12,9 +12,10 @@
* tests that the sys/param.h include can be included before
* endian detection and still have it work correctly.
*/
-#include <boost/predef/os/macos.h>
-#if BOOST_OS_MACOS
+#if defined(__APPLE__)
# include <sys/param.h>
+# include <boost/predef/os/bsd.h>
+# include <boost/predef/os/macos.h>
# include <boost/predef/other/endian.h>
#endif
Copied and modified: branches/release/libs/predef/test/macos_vs_bsd.c (from r86167, trunk/libs/predef/test/macos_vs_bsd.c)
==============================================================================
--- trunk/libs/predef/test/macos_vs_bsd.c Sat Oct 5 17:50:45 2013 (r86167, copy source)
+++ branches/release/libs/predef/test/macos_vs_bsd.c 2013-10-15 01:23:53 EDT (Tue, 15 Oct 2013) (r86315)
@@ -9,12 +9,11 @@
* OSX can masquerade as BSD when sys/param.h is previously included.
* So we test that we only detect OSX in this combination.
*/
-#include <boost/predef/os/macos.h>
-
-#if BOOST_OS_MACOS
+#if defined(__APPLE__)
# include <sys/param.h>
# include <boost/predef/os/bsd.h>
-# if BOOST_OS_BSD
-# error "Both BOOST_OS_MACOS and BOOST_OS_BSD defined."
+# include <boost/predef/os/macos.h>
+# if !BOOST_OS_MACOS || BOOST_OS_BSD
+# error "BOOST_OS_MACOS not detected and/or BOOST_OS_BSD mis-detected."
# endif
#endif
Modified: branches/release/libs/predef/test/make.cpp
==============================================================================
--- branches/release/libs/predef/test/make.cpp Tue Oct 15 00:44:00 2013 (r86314)
+++ branches/release/libs/predef/test/make.cpp 2013-10-15 01:23:53 EDT (Tue, 15 Oct 2013) (r86315)
@@ -45,8 +45,8 @@
PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VRRPP(99999) == BOOST_VERSION_NUMBER(9,99,99));
PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VRP000(999000) == BOOST_VERSION_NUMBER(9,9,9));
PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VRR000(999000) == BOOST_VERSION_NUMBER(9,99,0));
- PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VVRR00PP00(2199009900) == BOOST_VERSION_NUMBER(21,99,99));
- PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VVRR00PP00(9999009900L) == BOOST_VERSION_NUMBER(99,99,99));
+ PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VVRR00PP00(2199009900u) == BOOST_VERSION_NUMBER(21,99,99));
+ /* PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VVRR00PP00(9999009900ull) == BOOST_VERSION_NUMBER(99,99,99)); */
PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VVRR0PP00(999909900) == BOOST_VERSION_NUMBER(99,99,99));
PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VV00(9900) == BOOST_VERSION_NUMBER(99,00,00));
PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VVRR0PPPP(999909999) == BOOST_VERSION_NUMBER(99,99,9999));