From 7f08aede9950c30c84deb5ae91a91f6c1a7c3fca Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 15 Jul 2012 03:37:23 +0000 Subject: [PATCH] Partial work on changes post-review of Predef library: * shorter category names * CXX => COMP to be generic compiler category * add predef for string name of item * renamed all version make/extraction macros for clarity * C++ standard predef to use 1970.0.0 epoc date offset * subcategories for OS_BSD * start rewrite to support older preprocessors git-svn-id: http://svn.boost.org/svn/boost/sandbox/predef@79517 b8fc166d-592f-0410-95f2-cb63ce0dd405 --- boost/predef.h | 2 +- boost/predef/architecture.h | 2 +- boost/predef/architecture/alpha.h | 46 +- boost/predef/architecture/amd64.h | 23 +- boost/predef/architecture/arm.h | 35 +- boost/predef/architecture/convex.h | 47 +- boost/predef/architecture/ia64.h | 23 +- boost/predef/architecture/m68k.h | 51 +- boost/predef/architecture/mips.h | 47 +- boost/predef/architecture/parisc.h | 39 +- boost/predef/architecture/ppc.h | 39 +- boost/predef/architecture/pyramid.h | 23 +- boost/predef/architecture/rs6k.h | 25 +- boost/predef/architecture/sparc.h | 35 +- boost/predef/architecture/superh.h | 47 +- boost/predef/architecture/sys370.h | 23 +- boost/predef/architecture/sys390.h | 23 +- boost/predef/architecture/x86.h | 51 +- boost/predef/architecture/z.h | 26 +- boost/predef/compiler.h | 3 +- boost/predef/compiler/borland.h | 31 +- boost/predef/compiler/clang.h | 23 +- boost/predef/compiler/comeau.h | 31 +- boost/predef/compiler/compaq.h | 33 +- boost/predef/compiler/cygwin.h | 30 -- boost/predef/compiler/diab.h | 23 +- boost/predef/compiler/digitalmars.h | 23 +- boost/predef/compiler/dignus.h | 23 +- boost/predef/compiler/edg.h | 23 +- boost/predef/compiler/ekopath.h | 23 +- boost/predef/compiler/gcc.h | 31 +- boost/predef/compiler/gcc_xml.h | 23 +- boost/predef/compiler/greenhills.h | 31 +- boost/predef/compiler/hp_acc.h | 31 +- boost/predef/compiler/iar.h | 23 +- boost/predef/compiler/ibm.h | 39 +- boost/predef/compiler/intel.h | 31 +- boost/predef/compiler/kai.h | 23 +- boost/predef/compiler/llvm.h | 23 +- boost/predef/compiler/metaware.h | 23 +- boost/predef/compiler/metrowerks.h | 47 +- boost/predef/compiler/microtec.h | 23 +- boost/predef/compiler/mingw.h | 37 +- boost/predef/compiler/mpw.h | 31 +- boost/predef/compiler/palm.h | 23 +- boost/predef/compiler/pgi.h | 31 +- boost/predef/compiler/sgi_mipspro.h | 35 +- boost/predef/compiler/sunpro.h | 35 +- boost/predef/compiler/tendra.h | 23 +- boost/predef/compiler/visualc.h | 47 +- boost/predef/compiler/watcom.h | 23 +- boost/predef/detail/_cassert.h | 2 +- boost/predef/detail/_exception.h | 2 +- boost/predef/detail/test.h | 2 +- boost/predef/language.h | 2 +- boost/predef/language/objc.h | 23 +- boost/predef/language/stdc.h | 41 +- boost/predef/language/stdcpp.h | 65 ++- boost/predef/library.h | 2 +- boost/predef/library/c.h | 2 +- boost/predef/library/c/gnu.h | 31 +- boost/predef/library/c/uc.h | 23 +- boost/predef/library/c/vms.h | 23 +- boost/predef/library/c/zos.h | 35 +- boost/predef/library/std.h | 2 +- boost/predef/library/std/cxx.h | 23 +- boost/predef/library/std/dinkumware.h | 31 +- boost/predef/library/std/libcomo.h | 23 +- boost/predef/library/std/modena.h | 23 +- boost/predef/library/std/msl.h | 31 +- boost/predef/library/std/roguewave.h | 39 +- boost/predef/library/std/sgi.h | 31 +- boost/predef/library/std/stdcpp3.h | 31 +- boost/predef/library/std/stlport.h | 35 +- boost/predef/library/std/vacpp.h | 23 +- boost/predef/make.h | 125 +++-- boost/predef/os.h | 2 +- boost/predef/os/aix.h | 39 +- boost/predef/os/amigaos.h | 19 +- boost/predef/os/beos.h | 19 +- boost/predef/os/bsd.h | 161 ++----- boost/predef/os/bsd/bsdi.h | 37 ++ boost/predef/os/bsd/dragonfly.h | 39 ++ boost/predef/os/bsd/free.h | 47 ++ boost/predef/os/bsd/net.h | 62 +++ boost/predef/os/bsd/open.h | 87 ++++ boost/predef/os/cygwin.h | 19 +- boost/predef/os/hpux.h | 19 +- boost/predef/os/irix.h | 19 +- boost/predef/os/linux.h | 19 +- boost/predef/os/macos.h | 28 +- boost/predef/os/os400.h | 19 +- boost/predef/os/qnxnto.h | 31 +- boost/predef/os/solaris.h | 19 +- boost/predef/os/unix.h | 23 +- boost/predef/os/vms.h | 27 +- boost/predef/os/windows.h | 23 +- boost/predef/version_number.h | 2 +- libs/predef/doc/build.jam | 4 + libs/predef/doc/html/index.html | 11 +- libs/predef/doc/html/minimal.css | 17 +- libs/predef/doc/html/predef/reference.html | 535 ++++++++++++--------- libs/predef/doc/predef.qbk | 12 +- libs/predef/test/info_as_c.c | 2 +- libs/predef/test/info_as_cpp.cpp | 2 +- libs/predef/test/make.cpp | 48 +- libs/predef/test/version.cpp | 2 +- 107 files changed, 2341 insertions(+), 1228 deletions(-) delete mode 100644 boost/predef/compiler/cygwin.h create mode 100644 boost/predef/os/bsd/bsdi.h create mode 100644 boost/predef/os/bsd/dragonfly.h create mode 100644 boost/predef/os/bsd/free.h create mode 100644 boost/predef/os/bsd/net.h create mode 100644 boost/predef/os/bsd/open.h diff --git a/boost/predef.h b/boost/predef.h index f26f9a6..b763d94 100644 --- a/boost/predef.h +++ b/boost/predef.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) diff --git a/boost/predef/architecture.h b/boost/predef/architecture.h index 666d501..33a8840 100644 --- a/boost/predef/architecture.h +++ b/boost/predef/architecture.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2010 +Copyright Redshift Software, Inc. 2008-2012 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) diff --git a/boost/predef/architecture/alpha.h b/boost/predef/architecture/alpha.h index 04e4cd7..5ad4f8c 100644 --- a/boost/predef/architecture/alpha.h +++ b/boost/predef/architecture/alpha.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,29 +12,43 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_ARCHITECTURE_ALPHA`] +[heading `BOOST_ARCH_ALPHA`, [@http://en.wikipedia.org/wiki/DEC_Alpha DEC Alpha]] -[@http://en.wikipedia.org/wiki/DEC_Alpha DEC Alpha] architecture: -If available versions \[4-6\] are specifically detected. +[table + [[__predef_symbol__] [__predef_version__]] + [[`__alpha__`] [__predef_detection__]] + [[`__alpha`] [__predef_detection__]] + [[`_M_ALPHA`] [__predef_detection__]] + + [[`__alpha_ev4__`] [4.0.0]] + [[`__alpha_ev5__`] [5.0.0]] + [[`__alpha_ev6__`] [6.0.0]] + ] */ -#define BOOST_ARCHITECTURE_ALPHA BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_ARCH_ALPHA BOOST_VERSION_NUMBER(0,0,0) #if defined(__alpha__) || defined(__alpha) || \ defined(_M_ALPHA) - #undef BOOST_ARCHITECTURE_ALPHA - #if defined(__alpha_ev4__) - #define BOOST_ARCHITECTURE_ALPHA BOOST_VERSION_NUMBER(4,0,0) - #elif defined(__alpha_ev5__) - #define BOOST_ARCHITECTURE_ALPHA BOOST_VERSION_NUMBER(5,0,0) - #elif defined(__alpha_ev6__) - #define BOOST_ARCHITECTURE_ALPHA BOOST_VERSION_NUMBER(6,0,0) - #else - #define BOOST_ARCHITECTURE_ALPHA BOOST_VERSION_NUMBER(0,0,1) - #endif +# undef BOOST_ARCH_ALPHA +# if !defined(BOOST_ARCH_ALPHA) && defined(__alpha_ev4__) +# define BOOST_ARCH_ALPHA BOOST_VERSION_NUMBER(4,0,0) +# endif +# if !defined(BOOST_ARCH_ALPHA) && defined(__alpha_ev5__) +# define BOOST_ARCH_ALPHA BOOST_VERSION_NUMBER(5,0,0) +# endif +# if !defined(BOOST_ARCH_ALPHA) && defined(__alpha_ev6__) +# define BOOST_ARCH_ALPHA BOOST_VERSION_NUMBER(6,0,0) +# endif +# if !defined(BOOST_ARCH_ALPHA) +# define BOOST_ARCH_ALPHA BOOST_VERSION_NUMBER(0,0,1) +# endif #endif +#define BOOST_ARCH_ALPHA_NAME "DEC Alpha" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_ARCHITECTURE_ALPHA,"DEC Alpha") +BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_ALPHA,BOOST_ARCH_ALPHA_NAME) + #endif diff --git a/boost/predef/architecture/amd64.h b/boost/predef/architecture/amd64.h index e05d31e..29e5504 100644 --- a/boost/predef/architecture/amd64.h +++ b/boost/predef/architecture/amd64.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,21 +12,30 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_ARCHITECTURE_AMD64`] +[heading `BOOST_ARCH_AMD64`, [@http://en.wikipedia.org/wiki/Amd64 Advanced Micro Devices AMD 64] architecture.] -[@http://en.wikipedia.org/wiki/Amd64 American Micro Devices AMD 64] architecture. +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_ARCHITECTURE_AMD64 BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_ARCH_AMD64 BOOST_VERSION_NUMBER(0,0,0) #if defined(__amd64__) || defined(__amd64) || \ defined(__x86_64__) || defined(__x86_64) || \ defined(_M_X64) - #undef BOOST_ARCHITECTURE_AMD64 - #define BOOST_ARCHITECTURE_AMD64 BOOST_VERSION_NUMBER(0,0,1) +# undef BOOST_ARCH_AMD64 +# define BOOST_ARCH_AMD64 BOOST_VERSION_NUMBER(0,0,1) #endif +#define BOOST_ARCH_AMD64_NAME "Advanced Micro Devices AMD 64" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_ARCHITECTURE_AMD64,"American Micro Devices AMD 64") +BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_AMD64,BOOST_ARCH_AMD64_NAME) + #endif diff --git a/boost/predef/architecture/arm.h b/boost/predef/architecture/arm.h index d4170e1..9c5aaaa 100644 --- a/boost/predef/architecture/arm.h +++ b/boost/predef/architecture/arm.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,26 +12,37 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_ARCHITECTURE_ARM`] +[heading `BOOST_ARCH_ARM`] [@http://en.wikipedia.org/wiki/ARM_architecture ARM] architecture. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_ARCHITECTURE_ARM BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_ARCH_ARM BOOST_VERSION_NUMBER(0,0,0) #if defined(__arm__) || defined(__thumb__) || \ defined(__TARGET_ARCH_ARM) || defined(__TARGET_ARCH_THUMB) - #undef BOOST_ARCHITECTURE_ARM - #if defined(__TARGET_ARCH_ARM) - #define BOOST_ARCHITECTURE_ARM BOOST_VERSION_NUMBER(__TARGET_ARCH_ARM,0,0) - #elif defined(__TARGET_ARCH_THUMB) - #define BOOST_ARCHITECTURE_ARM BOOST_VERSION_NUMBER(__TARGET_ARCH_THUMB,0,0) - #else - #define BOOST_ARCHITECTURE_ARM BOOST_VERSION_NUMBER(0,0,1) - #endif +# undef BOOST_ARCH_ARM +# if defined(__TARGET_ARCH_ARM) +# define BOOST_ARCH_ARM BOOST_VERSION_NUMBER(__TARGET_ARCH_ARM,0,0) +# elif defined(__TARGET_ARCH_THUMB) +# define BOOST_ARCH_ARM BOOST_VERSION_NUMBER(__TARGET_ARCH_THUMB,0,0) +# else +# define BOOST_ARCH_ARM BOOST_VERSION_NUMBER(0,0,1) +# endif #endif +#define BOOST_ARCH_ARM_NAME "ARM" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_ARCHITECTURE_ARM,"ARM") +BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_ARM,BOOST_ARCH_ARM_NAME) + #endif diff --git a/boost/predef/architecture/convex.h b/boost/predef/architecture/convex.h index e11dcb3..d89059f 100644 --- a/boost/predef/architecture/convex.h +++ b/boost/predef/architecture/convex.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software Inc 2011 +Copyright Redshift Software Inc 2011-2012 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) @@ -12,32 +12,43 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_ARCHITECTURE_CONVEX`] +[heading `BOOST_ARCH_CONVEX`] [@http://en.wikipedia.org/wiki/Convex_Computer Convex Computer] architecture. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_ARCHITECTURE_CONVEX BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_ARCH_CONVEX BOOST_VERSION_NUMBER(0,0,0) #if defined(__convex__) - #undef BOOST_ARCHITECTURE_CONVEX - #if defined(__convex_c1__) - #define BOOST_ARCHITECTURE_CONVEX BOOST_VERSION_NUMBER(1,0,0) - #elif defined(__convex_c2__) - #define BOOST_ARCHITECTURE_CONVEX BOOST_VERSION_NUMBER(2,0,0) - #elif defined(__convex_c32__) - #define BOOST_ARCHITECTURE_CONVEX BOOST_VERSION_NUMBER(3,2,0) - #elif defined(__convex_c34__) - #define BOOST_ARCHITECTURE_CONVEX BOOST_VERSION_NUMBER(3,4,0) - #elif defined(__convex_c38__) - #define BOOST_ARCHITECTURE_CONVEX BOOST_VERSION_NUMBER(3,8,0) - #else - #define BOOST_ARCHITECTURE_CONVEX BOOST_VERSION_NUMBER(0,0,1) - #endif +# undef BOOST_ARCH_CONVEX +# if defined(__convex_c1__) +# define BOOST_ARCH_CONVEX BOOST_VERSION_NUMBER(1,0,0) +# elif defined(__convex_c2__) +# define BOOST_ARCH_CONVEX BOOST_VERSION_NUMBER(2,0,0) +# elif defined(__convex_c32__) +# define BOOST_ARCH_CONVEX BOOST_VERSION_NUMBER(3,2,0) +# elif defined(__convex_c34__) +# define BOOST_ARCH_CONVEX BOOST_VERSION_NUMBER(3,4,0) +# elif defined(__convex_c38__) +# define BOOST_ARCH_CONVEX BOOST_VERSION_NUMBER(3,8,0) +# else +# define BOOST_ARCH_CONVEX BOOST_VERSION_NUMBER(0,0,1) +# endif #endif +#define BOOST_ARCH_CONVEX_NAME "Convex Computer" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_ARCHITECTURE_CONVEX,"Convex Computer") +BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_CONVEX,BOOST_ARCH_CONVEX_NAME) + #endif diff --git a/boost/predef/architecture/ia64.h b/boost/predef/architecture/ia64.h index d46eb13..275bc91 100644 --- a/boost/predef/architecture/ia64.h +++ b/boost/predef/architecture/ia64.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,22 +12,33 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_ARCHITECTURE_IA64`] +[heading `BOOST_ARCH_IA64`] [@http://en.wikipedia.org/wiki/Ia64 Intel IA-64] architecture. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_ARCHITECTURE_IA64 BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_ARCH_IA64 BOOST_VERSION_NUMBER(0,0,0) #if defined(__ia64__) || defined(_IA64) || \ defined(__IA64__) || defined(__ia64) || \ defined(_M_IA64) || defined(__itanium__) || \ defined(__x86_64) || defined(__x86_64__) - #undef BOOST_ARCHITECTURE_IA64 - #define BOOST_ARCHITECTURE_IA64 BOOST_VERSION_NUMBER(0,0,1) +# undef BOOST_ARCH_IA64 +# define BOOST_ARCH_IA64 BOOST_VERSION_NUMBER(0,0,1) #endif +#define BOOST_ARCH_IA64_NAME "Intel IA-64" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_ARCHITECTURE_IA64,"Intel IA-64") +BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_IA64,BOOST_ARCH_IA64_NAME) + #endif diff --git a/boost/predef/architecture/m68k.h b/boost/predef/architecture/m68k.h index 9ec7d1c..31c880d 100644 --- a/boost/predef/architecture/m68k.h +++ b/boost/predef/architecture/m68k.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,33 +12,44 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_ARCHITECTURE_M68K`] +[heading `BOOST_ARCH_M68K`] [@http://en.wikipedia.org/wiki/M68k Motorola 68k] architecture. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_ARCHITECTURE_M68K BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_ARCH_M68K BOOST_VERSION_NUMBER(0,0,0) #if defined(__m68k__) || defined(M68000) - #undef BOOST_ARCHITECTURE_M68K - #if defined(__mc68060__) || defined(mc68060) || defined(__mc68060) - #define BOOST_ARCHITECTURE_M68K BOOST_VERSION_NUMBER(6,0,0) - #elif defined(__mc68040__) || defined(mc68040) || defined(__mc68040) - #define BOOST_ARCHITECTURE_M68K BOOST_VERSION_NUMBER(4,0,0) - #elif defined(__mc68030__) || defined(mc68030) || defined(__mc68030) - #define BOOST_ARCHITECTURE_M68K BOOST_VERSION_NUMBER(3,0,0) - #elif defined(__mc68020__) || defined(mc68020) || defined(__mc68020) - #define BOOST_ARCHITECTURE_M68K BOOST_VERSION_NUMBER(2,0,0) - #elif defined(__mc68010__) || defined(mc68010) || defined(__mc68010) - #define BOOST_ARCHITECTURE_M68K BOOST_VERSION_NUMBER(1,0,0) - #elif defined(__mc68000__) || defined(mc68000) || defined(__mc68000) - #define BOOST_ARCHITECTURE_M68K BOOST_VERSION_NUMBER(0,0,1) - #else - #define BOOST_ARCHITECTURE_M68K BOOST_VERSION_NUMBER(0,0,1) - #endif +# undef BOOST_ARCH_M68K +# if defined(__mc68060__) || defined(mc68060) || defined(__mc68060) +# define BOOST_ARCH_M68K BOOST_VERSION_NUMBER(6,0,0) +# elif defined(__mc68040__) || defined(mc68040) || defined(__mc68040) +# define BOOST_ARCH_M68K BOOST_VERSION_NUMBER(4,0,0) +# elif defined(__mc68030__) || defined(mc68030) || defined(__mc68030) +# define BOOST_ARCH_M68K BOOST_VERSION_NUMBER(3,0,0) +# elif defined(__mc68020__) || defined(mc68020) || defined(__mc68020) +# define BOOST_ARCH_M68K BOOST_VERSION_NUMBER(2,0,0) +# elif defined(__mc68010__) || defined(mc68010) || defined(__mc68010) +# define BOOST_ARCH_M68K BOOST_VERSION_NUMBER(1,0,0) +# elif defined(__mc68000__) || defined(mc68000) || defined(__mc68000) +# define BOOST_ARCH_M68K BOOST_VERSION_NUMBER(0,0,1) +# else +# define BOOST_ARCH_M68K BOOST_VERSION_NUMBER(0,0,1) +# endif #endif +#define BOOST_ARCH_M68K_NAME "Motorola 68k" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_ARCHITECTURE_M68K,"Motorola 68k") +BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_M68K,BOOST_ARCH_M68K_NAME) + #endif diff --git a/boost/predef/architecture/mips.h b/boost/predef/architecture/mips.h index 01433e7..a6f0c06 100644 --- a/boost/predef/architecture/mips.h +++ b/boost/predef/architecture/mips.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,32 +12,43 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_ARCHITECTURE_MIPS`] +[heading `BOOST_ARCH_MIPS`] [@http://en.wikipedia.org/wiki/MIPS_architecture MIPS] architecture. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_ARCHITECTURE_MIPS BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_ARCH_MIPS BOOST_VERSION_NUMBER(0,0,0) #if defined(__mips__) || defined(__mips) || \ defined(__MIPS__) - #undef BOOST_ARCHITECTURE_MIPS - #if defined(__mips) - #define BOOST_ARCHITECTURE_MIPS BOOST_VERSION_NUMBER(__mips,0,0) - #elif defined(_MIPS_ISA_MIPS1) || defined(_R3000) - #define BOOST_ARCHITECTURE_MIPS BOOST_VERSION_NUMBER(1,0,0) - #elif defined(_MIPS_ISA_MIPS2) || defined(__MIPS_ISA2__) || defined(_R4000) - #define BOOST_ARCHITECTURE_MIPS BOOST_VERSION_NUMBER(2,0,0) - #elif defined(_MIPS_ISA_MIPS3) || defined(__MIPS_ISA3__) - #define BOOST_ARCHITECTURE_MIPS BOOST_VERSION_NUMBER(3,0,0) - #elif defined(_MIPS_ISA_MIPS4) || defined(__MIPS_ISA4__) - #define BOOST_ARCHITECTURE_MIPS BOOST_VERSION_NUMBER(4,0,0) - #else - #define BOOST_ARCHITECTURE_MIPS BOOST_VERSION_NUMBER(0,0,1) - #endif +# undef BOOST_ARCH_MIPS +# if defined(__mips) +# define BOOST_ARCH_MIPS BOOST_VERSION_NUMBER(__mips,0,0) +# elif defined(_MIPS_ISA_MIPS1) || defined(_R3000) +# define BOOST_ARCH_MIPS BOOST_VERSION_NUMBER(1,0,0) +# elif defined(_MIPS_ISA_MIPS2) || defined(__MIPS_ISA2__) || defined(_R4000) +# define BOOST_ARCH_MIPS BOOST_VERSION_NUMBER(2,0,0) +# elif defined(_MIPS_ISA_MIPS3) || defined(__MIPS_ISA3__) +# define BOOST_ARCH_MIPS BOOST_VERSION_NUMBER(3,0,0) +# elif defined(_MIPS_ISA_MIPS4) || defined(__MIPS_ISA4__) +# define BOOST_ARCH_MIPS BOOST_VERSION_NUMBER(4,0,0) +# else +# define BOOST_ARCH_MIPS BOOST_VERSION_NUMBER(0,0,1) +# endif #endif +#define BOOST_ARCH_MIPS_NAME "MIPS" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_ARCHITECTURE_MIPS,"MIPS") +BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_MIPS,BOOST_ARCH_MIPS_NAME) + #endif diff --git a/boost/predef/architecture/parisc.h b/boost/predef/architecture/parisc.h index 0781b72..b9233d9 100644 --- a/boost/predef/architecture/parisc.h +++ b/boost/predef/architecture/parisc.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,27 +12,38 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_ARCHITECTURE_PARISK`] +[heading `BOOST_ARCH_PARISK`] [@http://en.wikipedia.org/wiki/PA-RISC_family HP/PA RISC] architecture. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_ARCHITECTURE_PARISC BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_ARCH_PARISC BOOST_VERSION_NUMBER(0,0,0) #if defined(__hppa__) || defined(__hppa) || defined(__HPPA__) - #undef BOOST_ARCHITECTURE_PARISC - #if defined(_PA_RISC1_0) - #define BOOST_ARCHITECTURE_PARISC BOOST_VERSION_NUMBER(1,0,0) - #elif defined(_PA_RISC1_1) || defined(__HPPA11__) || defined(__PA7100__) - #define BOOST_ARCHITECTURE_PARISC BOOST_VERSION_NUMBER(1,1,0) - #elif defined(_PA_RISC2_0) || defined(__RISC2_0__) || defined(__HPPA20__) || defined(__PA8000__) - #define BOOST_ARCHITECTURE_PARISC BOOST_VERSION_NUMBER(2,0,0) - #else - #define BOOST_ARCHITECTURE_PARISC BOOST_VERSION_NUMBER(0,0,1) - #endif +# undef BOOST_ARCH_PARISC +# if defined(_PA_RISC1_0) +# define BOOST_ARCH_PARISC BOOST_VERSION_NUMBER(1,0,0) +# elif defined(_PA_RISC1_1) || defined(__HPPA11__) || defined(__PA7100__) +# define BOOST_ARCH_PARISC BOOST_VERSION_NUMBER(1,1,0) +# elif defined(_PA_RISC2_0) || defined(__RISC2_0__) || defined(__HPPA20__) || defined(__PA8000__) +# define BOOST_ARCH_PARISC BOOST_VERSION_NUMBER(2,0,0) +# else +# define BOOST_ARCH_PARISC BOOST_VERSION_NUMBER(0,0,1) +# endif #endif +#define BOOST_ARCH_PARISC_NAME "HP/PA RISC" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_ARCHITECTURE_PARISC,"HP/PA RISC") +BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_PARISC,BOOST_ARCH_PARISC_NAME) + #endif diff --git a/boost/predef/architecture/ppc.h b/boost/predef/architecture/ppc.h index 76cb272..ff5f6dd 100644 --- a/boost/predef/architecture/ppc.h +++ b/boost/predef/architecture/ppc.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,31 +12,42 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_ARCHITECTURE_PPC`] +[heading `BOOST_ARCH_PPC`] [@http://en.wikipedia.org/wiki/PowerPC PowerPC] architecture. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_ARCHITECTURE_PPC BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_ARCH_PPC BOOST_VERSION_NUMBER(0,0,0) #if defined(__powerpc) || defined(__powerpc__) || \ defined(__POWERPC__) || defined(__ppc__) || \ defined(_M_PPC) || defined(_ARCH_PPC) || \ defined(__PPCGECKO__) || defined(__PPCBROADWAY__) || \ defined(_XENON) - #undef BOOST_ARCHITECTURE_PPC - #if defined(__ppc601__) || defined(_ARCH_601) - #define BOOST_ARCHITECTURE_PPC BOOST_VERSION_NUMBER(6,1,0) - #elif defined(__ppc603__) || defined(_ARCH_603) - #define BOOST_ARCHITECTURE_PPC BOOST_VERSION_NUMBER(6,3,0) - #elif defined(__ppc604__) || defined(__ppc604__) - #define BOOST_ARCHITECTURE_PPC BOOST_VERSION_NUMBER(6,4,0) - #else - #define BOOST_ARCHITECTURE_PPC BOOST_VERSION_NUMBER(0,0,1) - #endif +# undef BOOST_ARCH_PPC +# if defined(__ppc601__) || defined(_ARCH_601) +# define BOOST_ARCH_PPC BOOST_VERSION_NUMBER(6,1,0) +# elif defined(__ppc603__) || defined(_ARCH_603) +# define BOOST_ARCH_PPC BOOST_VERSION_NUMBER(6,3,0) +# elif defined(__ppc604__) || defined(__ppc604__) +# define BOOST_ARCH_PPC BOOST_VERSION_NUMBER(6,4,0) +# else +# define BOOST_ARCH_PPC BOOST_VERSION_NUMBER(0,0,1) +# endif #endif +#define BOOST_ARCH_PPC_NAME "PowerPC" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_ARCHITECTURE_PPC,"PowerPC") +BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_PPC,BOOST_ARCH_PPC_NAME) + #endif diff --git a/boost/predef/architecture/pyramid.h b/boost/predef/architecture/pyramid.h index 6f6825d..bd32624 100644 --- a/boost/predef/architecture/pyramid.h +++ b/boost/predef/architecture/pyramid.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software Inc 2011 +Copyright Redshift Software Inc 2011-2012 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) @@ -12,19 +12,30 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_ARCHITECTURE_PYRAMID`] +[heading `BOOST_ARCH_PYRAMID`] Pyramid 9810 architecture. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_ARCHITECTURE_PYRAMID BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_ARCH_PYRAMID BOOST_VERSION_NUMBER(0,0,0) #if defined(pyr) - #undef BOOST_ARCHITECTURE_PYRAMID - #define BOOST_ARCHITECTURE_PYRAMID BOOST_VERSION_NUMBER(0,0,1) +# undef BOOST_ARCH_PYRAMID +# define BOOST_ARCH_PYRAMID BOOST_VERSION_NUMBER(0,0,1) #endif +#define BOOST_ARCH_PYRAMID_NAME "Pyramid 9810" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_ARCHITECTURE_PYRAMID,"Pyramid 9810") +BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_PYRAMID,BOOST_ARCH_PYRAMID_NAME) + #endif diff --git a/boost/predef/architecture/rs6k.h b/boost/predef/architecture/rs6k.h index 10201f6..0a8a1cc 100644 --- a/boost/predef/architecture/rs6k.h +++ b/boost/predef/architecture/rs6k.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,23 +12,34 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_ARCHITECTURE_RS6000`] +[heading `BOOST_ARCH_RS6000`] [@http://en.wikipedia.org/wiki/RS/6000 RS/6000] architecture. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_ARCHITECTURE_RS6000 BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_ARCH_RS6000 BOOST_VERSION_NUMBER(0,0,0) #if defined(__THW_RS6000) || defined(_IBMR2) || \ defined(_POWER) || defined(_ARCH_PWR) || \ defined(_ARCH_PWR2) - #undef BOOST_ARCHITECTURE_RS6000 - #define BOOST_ARCHITECTURE_RS6000 BOOST_VERSION_NUMBER(0,0,1) +# undef BOOST_ARCH_RS6000 +# define BOOST_ARCH_RS6000 BOOST_VERSION_NUMBER(0,0,1) #endif -#define BOOST_ARCHITECTURE_PWR BOOST_ARCHITECTURE_RS6000 +#define BOOST_ARCH_PWR BOOST_ARCH_RS6000 + +#define BOOST_ARCH_RS6000_NAME "RS/6000" #include -BOOST_PREDEF_DECLARE_TEST(BOOST_ARCHITECTURE_RS6000,"RS/6000") +BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_RS6000,BOOST_ARCH_RS6000_NAME) + #endif diff --git a/boost/predef/architecture/sparc.h b/boost/predef/architecture/sparc.h index d344de1..ef20dd8 100644 --- a/boost/predef/architecture/sparc.h +++ b/boost/predef/architecture/sparc.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,25 +12,36 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_ARCHITECTURE_SPARC`] +[heading `BOOST_ARCH_SPARC`] [@http://en.wikipedia.org/wiki/SPARC SPARC] architecture. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_ARCHITECTURE_SPARC BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_ARCH_SPARC BOOST_VERSION_NUMBER(0,0,0) #if defined(__sparc__) || defined(__sparc) - #undef BOOST_ARCHITECTURE_SPARC - #if defined(__sparcv9) - #define BOOST_ARCHITECTURE_SPARC BOOST_VERSION_NUMBER(9,0,0) - #elif defined(__sparcv8) - #define BOOST_ARCHITECTURE_SPARC BOOST_VERSION_NUMBER(8,0,0) - #else - #define BOOST_ARCHITECTURE_SPARC BOOST_VERSION_NUMBER(0,0,1) - #endif +# undef BOOST_ARCH_SPARC +# if defined(__sparcv9) +# define BOOST_ARCH_SPARC BOOST_VERSION_NUMBER(9,0,0) +# elif defined(__sparcv8) +# define BOOST_ARCH_SPARC BOOST_VERSION_NUMBER(8,0,0) +# else +# define BOOST_ARCH_SPARC BOOST_VERSION_NUMBER(0,0,1) +# endif #endif +#define BOOST_ARCH_SPARC_NAME "SPARC" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_ARCHITECTURE_SPARC,"SPARC") +BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_SPARC,BOOST_ARCH_SPARC_NAME) + #endif diff --git a/boost/predef/architecture/superh.h b/boost/predef/architecture/superh.h index f8126a0..e78cef3 100644 --- a/boost/predef/architecture/superh.h +++ b/boost/predef/architecture/superh.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,32 +12,43 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_ARCHITECTURE_SH`] +[heading `BOOST_ARCH_SH`] [@http://en.wikipedia.org/wiki/SuperH SuperH] architecture: If available versions \[1-5\] are specifically detected. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_ARCHITECTURE_SH BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_ARCH_SH BOOST_VERSION_NUMBER(0,0,0) #if defined(__sh__) - #undef BOOST_ARCHITECTURE_SH - #if defined(__SH5__) - #define BOOST_ARCHITECTURE_SH BOOST_VERSION_NUMBER(5,0,0) - #elif defined(__SH4__) - #define BOOST_ARCHITECTURE_SH BOOST_VERSION_NUMBER(4,0,0) - #elif defined(__sh3__) || defined(__SH3__) - #define BOOST_ARCHITECTURE_SH BOOST_VERSION_NUMBER(3,0,0) - #elif defined(__sh2__) - #define BOOST_ARCHITECTURE_SH BOOST_VERSION_NUMBER(2,0,0) - #elif defined(__sh1__) - #define BOOST_ARCHITECTURE_SH BOOST_VERSION_NUMBER(1,0,0) - #else - #define BOOST_ARCHITECTURE_SH BOOST_VERSION_NUMBER(0,0,1) - #endif +# undef BOOST_ARCH_SH +# if defined(__SH5__) +# define BOOST_ARCH_SH BOOST_VERSION_NUMBER(5,0,0) +# elif defined(__SH4__) +# define BOOST_ARCH_SH BOOST_VERSION_NUMBER(4,0,0) +# elif defined(__sh3__) || defined(__SH3__) +# define BOOST_ARCH_SH BOOST_VERSION_NUMBER(3,0,0) +# elif defined(__sh2__) +# define BOOST_ARCH_SH BOOST_VERSION_NUMBER(2,0,0) +# elif defined(__sh1__) +# define BOOST_ARCH_SH BOOST_VERSION_NUMBER(1,0,0) +# else +# define BOOST_ARCH_SH BOOST_VERSION_NUMBER(0,0,1) +# endif #endif +#define BOOST_ARCH_SH_NAME "SuperH" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_ARCHITECTURE_SH,"SuperH") +BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_SH,BOOST_ARCH_SH_NAME) + #endif diff --git a/boost/predef/architecture/sys370.h b/boost/predef/architecture/sys370.h index eb0d6df..ff37c17 100644 --- a/boost/predef/architecture/sys370.h +++ b/boost/predef/architecture/sys370.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,19 +12,30 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_ARCHITECTURE_SYS370`] +[heading `BOOST_ARCH_SYS370`] [@http://en.wikipedia.org/wiki/System/370 System/370] architecture. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_ARCHITECTURE_SYS370 BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_ARCH_SYS370 BOOST_VERSION_NUMBER(0,0,0) #if defined(__370__) || defined(__THW_370__) - #undef BOOST_ARCHITECTURE_SYS370 - #define BOOST_ARCHITECTURE_SYS370 BOOST_VERSION_NUMBER(0,0,1) +# undef BOOST_ARCH_SYS370 +# define BOOST_ARCH_SYS370 BOOST_VERSION_NUMBER(0,0,1) #endif +#define BOOST_ARCH_SYS370_NAME "System/370" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_ARCHITECTURE_SYS370,"System/370") +BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_SYS370,BOOST_ARCH_SYS370_NAME) + #endif diff --git a/boost/predef/architecture/sys390.h b/boost/predef/architecture/sys390.h index e7c2107..153cc49 100644 --- a/boost/predef/architecture/sys390.h +++ b/boost/predef/architecture/sys390.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,19 +12,30 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_ARCHITECTURE_SYS390`] +[heading `BOOST_ARCH_SYS390`] [@http://en.wikipedia.org/wiki/System/390 System/390] architecture. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_ARCHITECTURE_SYS390 BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_ARCH_SYS390 BOOST_VERSION_NUMBER(0,0,0) #if defined(__s390__) || defined(__s390x__) - #undef BOOST_ARCHITECTURE_SYS390 - #define BOOST_ARCHITECTURE_SYS390 BOOST_VERSION_NUMBER(0,0,1) +# undef BOOST_ARCH_SYS390 +# define BOOST_ARCH_SYS390 BOOST_VERSION_NUMBER(0,0,1) #endif +#define BOOST_ARCH_SYS390_NAME "System/390" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_ARCHITECTURE_SYS390,"System/390") +BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_SYS390,BOOST_ARCH_SYS390_NAME) + #endif diff --git a/boost/predef/architecture/x86.h b/boost/predef/architecture/x86.h index e5afc92..140be4e 100644 --- a/boost/predef/architecture/x86.h +++ b/boost/predef/architecture/x86.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -11,13 +11,21 @@ http://www.boost.org/LICENSE_1_0.txt) #include #include -#define BOOST_ARCHITECTURE_X86 BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_ARCH_X86 BOOST_VERSION_NUMBER(0,0,0) /*` -[heading `BOOST_ARCHITECTURE_X86`] +[heading `BOOST_ARCH_X86`] [@http://en.wikipedia.org/wiki/X86 Intel x86] architecture: If available versions \[3-6\] are specifically detected. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ #if defined(i386) || defined(__i386__) || \ @@ -26,25 +34,28 @@ If available versions \[3-6\] are specifically detected. defined(_M_IX86) || defined(_X86_) || \ defined(__THW_INTEL__) || defined(__I86__) || \ defined(__INTEL__) - #undef BOOST_ARCHITECTURE_X86 - #if defined(__I86__) - #define BOOST_ARCHITECTURE_X86 BOOST_VERSION_NUMBER(__I86__,0,0) - #elif defined(_M_IX86) - #define BOOST_ARCHITECTURE_X86 BOOST_PREDEF_MAKE_NN_00(_M_IX86) - #elif defined(__i686__) - #define BOOST_ARCHITECTURE_X86 BOOST_VERSION_NUMBER(6,0,0) - #elif defined(__i586__) - #define BOOST_ARCHITECTURE_X86 BOOST_VERSION_NUMBER(5,0,0) - #elif defined(__i486__) - #define BOOST_ARCHITECTURE_X86 BOOST_VERSION_NUMBER(4,0,0) - #elif defined(__i386__) - #define BOOST_ARCHITECTURE_X86 BOOST_VERSION_NUMBER(3,0,0) - #else - #define BOOST_ARCHITECTURE_X86 BOOST_VERSION_NUMBER(0,0,1) - #endif +# undef BOOST_ARCH_X86 +# if defined(__I86__) +# define BOOST_ARCH_X86 BOOST_VERSION_NUMBER(__I86__,0,0) +# elif defined(_M_IX86) +# define BOOST_ARCH_X86 BOOST_PREDEF_MAKE_10_VV00(_M_IX86) +# elif defined(__i686__) +# define BOOST_ARCH_X86 BOOST_VERSION_NUMBER(6,0,0) +# elif defined(__i586__) +# define BOOST_ARCH_X86 BOOST_VERSION_NUMBER(5,0,0) +# elif defined(__i486__) +# define BOOST_ARCH_X86 BOOST_VERSION_NUMBER(4,0,0) +# elif defined(__i386__) +# define BOOST_ARCH_X86 BOOST_VERSION_NUMBER(3,0,0) +# else +# define BOOST_ARCH_X86 BOOST_VERSION_NUMBER(0,0,1) +# endif #endif +#define BOOST_ARCH_X86_NAME "Intel x86" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_ARCHITECTURE_X86,"Intel x86") +BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_X86,BOOST_ARCH_X86_NAME) + #endif diff --git a/boost/predef/architecture/z.h b/boost/predef/architecture/z.h index 0f13d8a..58f54b8 100644 --- a/boost/predef/architecture/z.h +++ b/boost/predef/architecture/z.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,18 +12,30 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_ARCHITECTURE_Z`] +[heading `BOOST_ARCH_Z`] -[@http://en.wikipedia.org/wiki/Z/Architecture z/Architecture] architecture. */ +[@http://en.wikipedia.org/wiki/Z/Architecture z/Architecture] architecture. -#define BOOST_ARCHITECTURE_Z BOOST_VERSION_NUMBER(0,0,0) +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] + */ + +#define BOOST_ARCH_Z BOOST_VERSION_NUMBER(0,0,0) #if defined(__SYSC_ZARCH__) - #undef BOOST_ARCHITECTURE_Z - #define BOOST_ARCHITECTURE_Z BOOST_VERSION_NUMBER(0,0,1) +# undef BOOST_ARCH_Z +# define BOOST_ARCH_Z BOOST_VERSION_NUMBER(0,0,1) #endif +#define BOOST_ARCH_Z_NAME "z/Architecture" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_ARCHITECTURE_Z,"z/Architecture") +BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_Z,BOOST_ARCH_Z_NAME) + #endif diff --git a/boost/predef/compiler.h b/boost/predef/compiler.h index ab36848..4a37452 100644 --- a/boost/predef/compiler.h +++ b/boost/predef/compiler.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2010 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,7 +12,6 @@ http://www.boost.org/LICENSE_1_0.txt) #include #include #include -#include #include #include #include diff --git a/boost/predef/compiler/borland.h b/boost/predef/compiler/borland.h index e797669..e696294 100644 --- a/boost/predef/compiler/borland.h +++ b/boost/predef/compiler/borland.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,24 +12,35 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_CXX_BORLAND`] +[heading `BOOST_COMP_BORLAND`] [@http://en.wikipedia.org/wiki/C_plus_plus_builder Borland C++] compiler. Version number available as major, minor, and patch. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_CXX_BORLAND BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_COMP_BORLAND BOOST_VERSION_NUMBER(0,0,0) #if defined(__BORLANDC__) || defined(__CODEGEARC__) - #undef BOOST_CXX_BORLAND - #if defined(__CODEGEARC__) - #define BOOST_CXX_BORLAND BOOST_PREDEF_MAKE_FF_F_F(__CODEGEARC__) - #else - #define BOOST_CXX_BORLAND BOOST_PREDEF_MAKE_FF_F_F(__BORLANDC__) - #endif +# undef BOOST_COMP_BORLAND +# if defined(__CODEGEARC__) +# define BOOST_COMP_BORLAND BOOST_PREDEF_MAKE_0X_VVRP(__CODEGEARC__) +# else +# define BOOST_COMP_BORLAND BOOST_PREDEF_MAKE_0X_VVRP(__BORLANDC__) +# endif #endif +#define BOOST_COMP_BORLAND_NAME "Borland C++" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_BORLAND,"Borland C++") +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_BORLAND,BOOST_COMP_BORLAND_NAME) + #endif diff --git a/boost/predef/compiler/clang.h b/boost/predef/compiler/clang.h index 2e149e5..8226522 100644 --- a/boost/predef/compiler/clang.h +++ b/boost/predef/compiler/clang.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,20 +12,31 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_CXX_CLANG`] +[heading `BOOST_COMP_CLANG`] [@http://en.wikipedia.org/wiki/Clang Clang] compiler. Version number available as major, minor, and patch. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_CXX_CLANG BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_COMP_CLANG BOOST_VERSION_NUMBER(0,0,0) #if defined(__clang__) - #undef BOOST_CXX_CLANG - #define BOOST_CXX_CLANG BOOST_VERSION_NUMBER(__clang_major__,__clang_minor__,__clang_patchlevel__) +# undef BOOST_COMP_CLANG +# define BOOST_COMP_CLANG BOOST_VERSION_NUMBER(__clang_major__,__clang_minor__,__clang_patchlevel__) #endif +#define BOOST_COMP_CLANG_NAME "Clang" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_CLANG,"Clang") +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_CLANG,BOOST_COMP_CLANG_NAME) + #endif diff --git a/boost/predef/compiler/comeau.h b/boost/predef/compiler/comeau.h index ce0f5c0..5e4fdc6 100644 --- a/boost/predef/compiler/comeau.h +++ b/boost/predef/compiler/comeau.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -11,25 +11,36 @@ http://www.boost.org/LICENSE_1_0.txt) #include #include -#define BOOST_CXX_COMO BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_COMP_COMO BOOST_VERSION_NUMBER(0,0,0) /*` -[heading `BOOST_CXX_COMO`] +[heading `BOOST_COMP_COMO`] [@http://en.wikipedia.org/wiki/Comeau_C/C%2B%2B Comeau C++] compiler. Version number available as major, minor, and patch. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ #if defined(__COMO__) - #undef BOOST_CXX_COMO - #if defined(__CONO_VERSION__) - #define BOOST_CXX_COMO BOOST_PREDEF_MAKE_F_F_F(__COMO_VERSION__) - #else - #define BOOST_CXX_COMO BOOST_VERSION_NUMBER(0,0,1) - #endif +# undef BOOST_COMP_COMO +# if defined(__CONO_VERSION__) +# define BOOST_COMP_COMO BOOST_PREDEF_MAKE_0X_VRP(__COMO_VERSION__) +# else +# define BOOST_COMP_COMO BOOST_VERSION_NUMBER(0,0,1) +# endif #endif +#define BOOST_COMP_COMO_NAME "Comeau C++" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_COMO,"Comeau C++") +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_COMO,BOOST_COMP_COMO_NAME) + #endif diff --git a/boost/predef/compiler/compaq.h b/boost/predef/compiler/compaq.h index 71df1ea..3cbff61 100644 --- a/boost/predef/compiler/compaq.h +++ b/boost/predef/compiler/compaq.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,25 +12,36 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_CXX_DEC`] +[heading `BOOST_COMP_DEC`] [@http://www.openvms.compaq.com/openvms/brochures/deccplus/ Compaq C/C++] compiler. Version number available as major, minor, and patch. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_CXX_DEC BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_COMP_DEC BOOST_VERSION_NUMBER(0,0,0) #if defined(__DECC) || defined(__DECCXX) - #undef BOOST_CXX_DEC - #if defined(__DECCXX_VER) - #define BOOST_CXX_DEC BOOST_PREDEF_MAKE_NN_NN_0_NN_00(__DECCXX_VER) - #elif defined(__DECC_VER) - #define BOOST_CXX_DEC BOOST_PREDEF_MAKE_NN_NN_0_NN_00(__DECC_VER) - #else - #endif +# undef BOOST_COMP_DEC +# if defined(__DECCXX_VER) +# define BOOST_COMP_DEC BOOST_PREDEF_MAKE_10_VVRR0PP00(__DECCXX_VER) +# elif defined(__DECC_VER) +# define BOOST_COMP_DEC BOOST_PREDEF_MAKE_10_VVRR0PP00(__DECC_VER) +# else +# endif #endif +#define BOOST_COMP_DEC_NAME "Compaq C/C++" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_DEC,"Compaq C/C++") +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_DEC,BOOST_COMP_DEC_NAME) + #endif diff --git a/boost/predef/compiler/cygwin.h b/boost/predef/compiler/cygwin.h deleted file mode 100644 index 766d3cd..0000000 --- a/boost/predef/compiler/cygwin.h +++ /dev/null @@ -1,30 +0,0 @@ -/* -Copyright Redshift Software, Inc. 2008-2011 -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_COMPILER_CYGWIN_H -#define BOOST_PREDEF_COMPILER_CYGWIN_H - -#include -#include - -/*` -[heading `BOOST_CXX_CYGWIN`] - -[@http://en.wikipedia.org/wiki/XXX Cygwin] compiler. - */ - -#define BOOST_CXX_CYGWIN BOOST_VERSION_NUMBER(0,0,0) - -#if defined(__CYGWIN__) - #undef BOOST_CXX_CYGWIN - #define BOOST_CXX_CYGWIN BOOST_VERSION_NUMBER(0,0,1) -#endif - -#include -BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_CYGWIN,"Cygwin") - -#endif diff --git a/boost/predef/compiler/diab.h b/boost/predef/compiler/diab.h index 6e46d67..9160f1c 100644 --- a/boost/predef/compiler/diab.h +++ b/boost/predef/compiler/diab.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,20 +12,31 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_CXX_DIAB`] +[heading `BOOST_COMP_DIAB`] [@http://www.windriver.com/products/development_suite/wind_river_compiler/ Diab C/C++] compiler. Version number available as major, minor, and patch. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_CXX_DIAB BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_COMP_DIAB BOOST_VERSION_NUMBER(0,0,0) #if defined(__DCC__) - #undef BOOST_CXX_DIAB - #define BOOST_CXX_DIAB BOOST_PREDEF_MAKE_N_N_NN(__VERSION_NUMBER__) +# undef BOOST_COMP_DIAB +# define BOOST_COMP_DIAB BOOST_PREDEF_MAKE_10_VRPP(__VERSION_NUMBER__) #endif +#define BOOST_COMP_DIAB_NAME "Diab C/C++" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_DIAB,"Diab C/C++") +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_DIAB,BOOST_COMP_DIAB_NAME) + #endif diff --git a/boost/predef/compiler/digitalmars.h b/boost/predef/compiler/digitalmars.h index 6af5a5a..419ab54 100644 --- a/boost/predef/compiler/digitalmars.h +++ b/boost/predef/compiler/digitalmars.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,20 +12,31 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_CXX_DMC`] +[heading `BOOST_COMP_DMC`] [@http://en.wikipedia.org/wiki/Digital_Mars Digital Mars] compiler. Version number available as major, minor, and patch. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_CXX_DMC BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_COMP_DMC BOOST_VERSION_NUMBER(0,0,0) #if defined(__DMC__) - #undef BOOST_CXX_DMC - #define BOOST_CXX_DMC BOOST_PREDEF_MAKE_F_F_F(__DMC__) +# undef BOOST_COMP_DMC +# define BOOST_COMP_DMC BOOST_PREDEF_MAKE_0X_VRP(__DMC__) #endif +#define BOOST_COMP_DMC_NAME "Digital Mars" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_DMC,"Digital Mars") +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_DMC,BOOST_COMP_DMC_NAME) + #endif diff --git a/boost/predef/compiler/dignus.h b/boost/predef/compiler/dignus.h index a767e0f..c9aff51 100644 --- a/boost/predef/compiler/dignus.h +++ b/boost/predef/compiler/dignus.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,20 +12,31 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_CXX_SYSC`] +[heading `BOOST_COMP_SYSC`] [@http://www.dignus.com/dcxx/ Dignus Systems/C++] compiler. Version number available as major, minor, and patch. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_CXX_SYSC BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_COMP_SYSC BOOST_VERSION_NUMBER(0,0,0) #if defined(__SYSC__) - #undef BOOST_CXX_SYSC - #define BOOST_CXX_SYSC BOOST_PREDEF_MAKE_N_NN_NN(__SYSC_VER__) +# undef BOOST_COMP_SYSC +# define BOOST_COMP_SYSC BOOST_PREDEF_MAKE_10_VRRPP(__SYSC_VER__) #endif +#define BOOST_COMP_SYSC_NAME "Dignus Systems/C++" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_SYSC,"Dignus Systems/C++") +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_SYSC,BOOST_COMP_SYSC_NAME) + #endif diff --git a/boost/predef/compiler/edg.h b/boost/predef/compiler/edg.h index 4992fb8..9e4c2a7 100644 --- a/boost/predef/compiler/edg.h +++ b/boost/predef/compiler/edg.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,20 +12,31 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_CXX_EDG`] +[heading `BOOST_COMP_EDG`] [@http://en.wikipedia.org/wiki/Edison_Design_Group EDG C++ Frontend] compiler. Version number available as major, minor, and patch. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_CXX_EDG BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_COMP_EDG BOOST_VERSION_NUMBER(0,0,0) #if defined(__EDG__) - #undef BOOST_CXX_EDG - #define BOOST_CXX_EDG BOOST_PREDEF_MAKE_N_NN(__EDG_VERSION__) +# undef BOOST_COMP_EDG +# define BOOST_COMP_EDG BOOST_PREDEF_MAKE_10_VRR(__EDG_VERSION__) #endif +#define BOOST_COMP_EDG_NAME "EDG C++ Frontend" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_EDG,"EDG C++ Frontend") +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_EDG,BOOST_COMP_EDG_NAME) + #endif diff --git a/boost/predef/compiler/ekopath.h b/boost/predef/compiler/ekopath.h index dff0927..1db449b 100644 --- a/boost/predef/compiler/ekopath.h +++ b/boost/predef/compiler/ekopath.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,21 +12,32 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_CXX_PATH`] +[heading `BOOST_COMP_PATH`] [@http://en.wikipedia.org/wiki/PathScale EKOpath] compiler. Version number available as major, minor, and patch. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_CXX_PATH BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_COMP_PATH BOOST_VERSION_NUMBER(0,0,0) #if defined(__PATHCC__) - #undef BOOST_CXX_PATH - #define BOOST_CXX_PATH \ +# undef BOOST_COMP_PATH +# define BOOST_COMP_PATH \ BOOST_VERSION_NUMBER(__PATHCC__,__PATHCC_MINOR__,__PATHCC_PATCHLEVEL__) #endif +#define BOOST_COMP_PATH_NAME "EKOpath" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_PATH,"EKOpath") +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_PATH,BOOST_COMP_PATH_NAME) + #endif diff --git a/boost/predef/compiler/gcc.h b/boost/predef/compiler/gcc.h index 82c21b6..d18e297 100644 --- a/boost/predef/compiler/gcc.h +++ b/boost/predef/compiler/gcc.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,26 +12,37 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_CXX_GNUC`] +[heading `BOOST_COMP_GNUC`] [@http://en.wikipedia.org/wiki/GNU_Compiler_Collection Gnu GCC C/C++] compiler. Version number available as major, minor, and patch (if available). + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_CXX_GNUC BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_COMP_GNUC BOOST_VERSION_NUMBER(0,0,0) #if defined(__GNUC__) - #undef BOOST_CXX_GNUC - #if defined(__GNUC_PATCHLEVEL__) - #define BOOST_CXX_GNUC \ +# undef BOOST_COMP_GNUC +# if defined(__GNUC_PATCHLEVEL__) +# define BOOST_COMP_GNUC \ BOOST_VERSION_NUMBER(__GNUC__,__GNUC_MINOR__,__GNUC_PATCHLEVEL__) - #else - #define BOOST_CXX_GNUC \ +# else +# define BOOST_COMP_GNUC \ BOOST_VERSION_NUMBER(__GNUC__,__GNUC_MINOR__,0) - #endif +# endif #endif +#define BOOST_COMP_GNUC_NAME "Gnu GCC C/C++" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_GNUC,"Gnu GCC C/C++") +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_GNUC,BOOST_COMP_GNUC_NAME) + #endif diff --git a/boost/predef/compiler/gcc_xml.h b/boost/predef/compiler/gcc_xml.h index 2666fb2..6f787a5 100644 --- a/boost/predef/compiler/gcc_xml.h +++ b/boost/predef/compiler/gcc_xml.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,19 +12,30 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_CXX_GCCXML`] +[heading `BOOST_COMP_GCCXML`] [@http://en.wikipedia.org/wiki/XXX GCC XML] compiler. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_CXX_GCCXML BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_COMP_GCCXML BOOST_VERSION_NUMBER(0,0,0) #if defined(__GCCXML__) - #undef BOOST_CXX_GCCXML - #define BOOST_CXX_GCCXML BOOST_VERSION_NUMBER(0,0,1) +# undef BOOST_COMP_GCCXML +# define BOOST_COMP_GCCXML BOOST_VERSION_NUMBER(0,0,1) #endif +#define BOOST_COMP_GCCXML_NAME "GCC XML" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_GCCXML,"GCC XML") +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_GCCXML,BOOST_COMP_GCCXML_NAME) + #endif diff --git a/boost/predef/compiler/greenhills.h b/boost/predef/compiler/greenhills.h index 65b0153..1ae4f01 100644 --- a/boost/predef/compiler/greenhills.h +++ b/boost/predef/compiler/greenhills.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,24 +12,35 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_CXX_GHS`] +[heading `BOOST_COMP_GHS`] [@http://en.wikipedia.org/wiki/Green_Hills_Software Green Hills C/C++] compiler. Version number available as major, minor, and patch. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_CXX_GHS BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_COMP_GHS BOOST_VERSION_NUMBER(0,0,0) #if defined(__ghs) || defined(__ghs__) - #undef BOOST_CXX_GHS - #if defined(__GHS_VERSION_NUMBER__) - #define BOOST_CXX_GHS BOOST_PREDEF_MAKE_N_N_N(__GHS_VERSION_NUMBER__) - #else if defined(__ghs) - #define BOOST_CXX_GHS BOOST_PREDEF_MAKE_N_N_N(__ghs) - #endif +# undef BOOST_COMP_GHS +# if defined(__GHS_VERSION_NUMBER__) +# define BOOST_COMP_GHS BOOST_PREDEF_MAKE_10_VRP(__GHS_VERSION_NUMBER__) +# else if defined(__ghs) +# define BOOST_COMP_GHS BOOST_PREDEF_MAKE_10_VRP(__ghs) +# endif #endif +#define BOOST_COMP_GHS_NAME "Green Hills C/C++" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_GHS,"Green Hills C/C++") +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_GHS,BOOST_COMP_GHS_NAME) + #endif diff --git a/boost/predef/compiler/hp_acc.h b/boost/predef/compiler/hp_acc.h index c3ceeca..0e258f1 100644 --- a/boost/predef/compiler/hp_acc.h +++ b/boost/predef/compiler/hp_acc.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,24 +12,35 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_CXX_HPACC`] +[heading `BOOST_COMP_HPACC`] HP aC++ compiler. Version number available as major, minor, and patch. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_CXX_HPACC BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_COMP_HPACC BOOST_VERSION_NUMBER(0,0,0) #if defined(__HP_aCC) - #undef BOOST_CXX_HPACC - #if (__HP_aCC > 1) - #define BOOST_CXX_HPACC BOOST_PREDEF_MAKE_NN_NN_NN(__HP_aCC) - #else - #define BOOST_CXX_HPACC BOOST_VERSION_NUMBER(0,0,1) - #endif +# undef BOOST_COMP_HPACC +# if (__HP_aCC > 1) +# define BOOST_COMP_HPACC BOOST_PREDEF_MAKE_10_VVRRPP(__HP_aCC) +# else +# define BOOST_COMP_HPACC BOOST_VERSION_NUMBER(0,0,1) +# endif #endif +#define BOOST_COMP_HPACC_NAME "HP aC++" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_HPACC,"HP aC++") +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_HPACC,BOOST_COMP_HPACC_NAME) + #endif diff --git a/boost/predef/compiler/iar.h b/boost/predef/compiler/iar.h index 95fd479..ac06558 100644 --- a/boost/predef/compiler/iar.h +++ b/boost/predef/compiler/iar.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,20 +12,31 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_CXX_IAR`] +[heading `BOOST_COMP_IAR`] IAR C/C++ compiler. Version number available as major, minor, and patch. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_CXX_IAR BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_COMP_IAR BOOST_VERSION_NUMBER(0,0,0) #if defined(__IAR_SYSTEMS_ICC__) - #undef BOOST_CXX_IAR - #define BOOST_CXX_IAR BOOST_PREDEF_MAKE_NN_NN(__VER__) +# undef BOOST_COMP_IAR +# define BOOST_COMP_IAR BOOST_PREDEF_MAKE_10_VVRR(__VER__) #endif +#define BOOST_COMP_IAR_NAME "IAR C/C++" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_IAR,"IAR C/C++") +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_IAR,BOOST_COMP_IAR_NAME) + #endif diff --git a/boost/predef/compiler/ibm.h b/boost/predef/compiler/ibm.h index 67b0c94..76f8a13 100644 --- a/boost/predef/compiler/ibm.h +++ b/boost/predef/compiler/ibm.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,28 +12,39 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_CXX_IBM`] +[heading `BOOST_COMP_IBM`] [@http://en.wikipedia.org/wiki/VisualAge IBM XL C/C++] compiler. Version number available as major, minor, and patch. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_CXX_IBM BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_COMP_IBM BOOST_VERSION_NUMBER(0,0,0) #if defined(__IBMCPP__) || defined(__xlC__) || defined(__xlc__) - #undef BOOST_CXX_IBM - #if defined(__COMPILER_VER__) - #define BOOST_CXX_IBM BOOST_PREDEF_MAKE_F_FF_FFFF(__COMPILER_VER__) - #elif defined(__xlC__) - #define BOOST_CXX_IBM BOOST_PREDEF_MAKE_FF_FF(__xlC__) - #elif defined(__xlc__) - #define BOOST_CXX_IBM BOOST_PREDEF_MAKE_FF_FF(__xlc__) - #else - #define BOOST_CXX_IBM BOOST_PREDEF_MAKE_N_N_N(__IBMCPP__) - #endif +# undef BOOST_COMP_IBM +# if defined(__COMPILER_VER__) +# define BOOST_COMP_IBM BOOST_PREDEF_MAKE_0X_VRRPPPP(__COMPILER_VER__) +# elif defined(__xlC__) +# define BOOST_COMP_IBM BOOST_PREDEF_MAKE_0X_VVRR(__xlC__) +# elif defined(__xlc__) +# define BOOST_COMP_IBM BOOST_PREDEF_MAKE_0X_VVRR(__xlc__) +# else +# define BOOST_COMP_IBM BOOST_PREDEF_MAKE_10_VRP(__IBMCPP__) +# endif #endif +#define BOOST_COMP_IBM_NAME "IBM XL C/C++" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_IBM,"IBM XL C/C++") +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_IBM,BOOST_COMP_IBM_NAME) + #endif diff --git a/boost/predef/compiler/intel.h b/boost/predef/compiler/intel.h index d3b2578..de04095 100644 --- a/boost/predef/compiler/intel.h +++ b/boost/predef/compiler/intel.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,25 +12,36 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_CXX_INTEL`] +[heading `BOOST_COMP_INTEL`] [@http://en.wikipedia.org/wiki/Intel_C%2B%2B Intel C/C++] compiler. Version number available as major, minor, and patch. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_CXX_INTEL BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_COMP_INTEL BOOST_VERSION_NUMBER(0,0,0) #if defined(__INTEL_COMPILER) || defined(__ICL) || defined(__ICC) || \ defined(__ECC) - #undef BOOST_CXX_INTEL - #if defined(__INTEL_COMPILER) - #define BOOST_CXX_INTEL BOOST_PREDEF_MAKE_N_N_N(__INTEL_COMPILER) - #else - #define BOOST_CXX_INTEL BOOST_VERSION_NUMBER(0,0,1) - #endif +# undef BOOST_COMP_INTEL +# if defined(__INTEL_COMPILER) +# define BOOST_COMP_INTEL BOOST_PREDEF_MAKE_10_VRP(__INTEL_COMPILER) +# else +# define BOOST_COMP_INTEL BOOST_VERSION_NUMBER(0,0,1) +# endif #endif +#define BOOST_COMP_INTEL_NAME "Intel C/C++" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_INTEL,"Intel C/C++") +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_INTEL,BOOST_COMP_INTEL_NAME) + #endif diff --git a/boost/predef/compiler/kai.h b/boost/predef/compiler/kai.h index 6888900..185acfb 100644 --- a/boost/predef/compiler/kai.h +++ b/boost/predef/compiler/kai.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,20 +12,31 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_CXX_KCC`] +[heading `BOOST_COMP_KCC`] Kai C++ compiler. Version number available as major, minor, and patch. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_CXX_KCC BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_COMP_KCC BOOST_VERSION_NUMBER(0,0,0) #if defined(__KCC) - #undef BOOST_CXX_KCC - #define BOOST_CXX_KCC BOOST_PREDEF_MAKE_F_F_FF(__KCC_VERSION) +# undef BOOST_COMP_KCC +# define BOOST_COMP_KCC BOOST_PREDEF_MAKE_0X_VRPP(__KCC_VERSION) #endif +#define BOOST_COMP_KCC_NAME "Kai C++" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_KCC,"Kai C++") +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_KCC,BOOST_COMP_KCC_NAME) + #endif diff --git a/boost/predef/compiler/llvm.h b/boost/predef/compiler/llvm.h index 57b731d..ceef2ce 100644 --- a/boost/predef/compiler/llvm.h +++ b/boost/predef/compiler/llvm.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,19 +12,30 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_CXX_LLVM`] +[heading `BOOST_COMP_LLVM`] [@http://en.wikipedia.org/wiki/LLVM LLVM] compiler. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_CXX_LLVM BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_COMP_LLVM BOOST_VERSION_NUMBER(0,0,0) #if defined(__llvm__) - #undef BOOST_CXX_LLVM - #define BOOST_CXX_LLVM BOOST_VERSION_NUMBER(0,0,1) +# undef BOOST_COMP_LLVM +# define BOOST_COMP_LLVM BOOST_VERSION_NUMBER(0,0,1) #endif +#define BOOST_COMP_LLVM_NAME "LLVM" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_LLVM,"LLVM") +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_LLVM,BOOST_COMP_LLVM_NAME) + #endif diff --git a/boost/predef/compiler/metaware.h b/boost/predef/compiler/metaware.h index 67fdc60..1494836 100644 --- a/boost/predef/compiler/metaware.h +++ b/boost/predef/compiler/metaware.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,19 +12,30 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_CXX_HIGHC`] +[heading `BOOST_COMP_HIGHC`] MetaWare High C/C++ compiler. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_CXX_HIGHC BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_COMP_HIGHC BOOST_VERSION_NUMBER(0,0,0) #if defined(__HIGHC__) - #undef BOOST_CXX_HIGHC - #define BOOST_CXX_HIGHC BOOST_VERSION_NUMBER(0,0,1) +# undef BOOST_COMP_HIGHC +# define BOOST_COMP_HIGHC BOOST_VERSION_NUMBER(0,0,1) #endif +#define BOOST_COMP_HIGHC_NAME "MetaWare High C/C++" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_HIGHC,"MetaWare High C/C++") +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_HIGHC,BOOST_COMP_HIGHC_NAME) + #endif diff --git a/boost/predef/compiler/metrowerks.h b/boost/predef/compiler/metrowerks.h index 103ee6e..a8af065 100644 --- a/boost/predef/compiler/metrowerks.h +++ b/boost/predef/compiler/metrowerks.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,32 +12,43 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_CXX_MWERKS`] +[heading `BOOST_COMP_MWERKS`] [@http://en.wikipedia.org/wiki/CodeWarrior Metrowerks CodeWarrior] compiler. Version number available as major, minor, and patch. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_CXX_MWERKS BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_COMP_MWERKS BOOST_VERSION_NUMBER(0,0,0) #if defined(__MWERKS__) || defined(__CWCC__) - #undef BOOST_CXX_MWERKS - #if defined(__CWCC__) - #define BOOST_CXX_MWERKS BOOST_PREDEF_MAKE_F_F_FF(__CWCC__) - #elif (__MWERKS__ >= 0x4200) - #define BOOST_CXX_MWERKS BOOST_PREDEF_MAKE_F_F_FF(__MWERKS__) - #elif (__MWERKS__ >= 0x3204) // note the "skip": 04->9.3 - #define BOOST_CXX_MWERKS BOOST_VERSION_NUMBER(9,(__MWERKS__)%100-1,0) - #elif (__MWERKS__ >= 0x3200) - #define BOOST_CXX_MWERKS BOOST_VERSION_NUMBER(9,(__MWERKS__)%100,0) - #elif (__MWERKS__ >= 0x3000) - #define BOOST_CXX_MWERKS BOOST_VERSION_NUMBER(8,(__MWERKS__)%100,0) - #else - #define BOOST_CXX_MWERKS BOOST_VERSION_NUMBER(0,0,1) - #endif +# undef BOOST_COMP_MWERKS +# if defined(__CWCC__) +# define BOOST_COMP_MWERKS BOOST_PREDEF_MAKE_0X_VRPP(__CWCC__) +# elif (__MWERKS__ >= 0x4200) +# define BOOST_COMP_MWERKS BOOST_PREDEF_MAKE_0X_VRPP(__MWERKS__) +# elif (__MWERKS__ >= 0x3204) // note the "skip": 04->9.3 +# define BOOST_COMP_MWERKS BOOST_VERSION_NUMBER(9,(__MWERKS__)%100-1,0) +# elif (__MWERKS__ >= 0x3200) +# define BOOST_COMP_MWERKS BOOST_VERSION_NUMBER(9,(__MWERKS__)%100,0) +# elif (__MWERKS__ >= 0x3000) +# define BOOST_COMP_MWERKS BOOST_VERSION_NUMBER(8,(__MWERKS__)%100,0) +# else +# define BOOST_COMP_MWERKS BOOST_VERSION_NUMBER(0,0,1) +# endif #endif +#define BOOST_COMP_MWERKS_NAME "Metrowerks CodeWarrior" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_MWERKS,"Metrowerks CodeWarrior") +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_MWERKS,BOOST_COMP_MWERKS_NAME) + #endif diff --git a/boost/predef/compiler/microtec.h b/boost/predef/compiler/microtec.h index 77c020a..be92bf4 100644 --- a/boost/predef/compiler/microtec.h +++ b/boost/predef/compiler/microtec.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,19 +12,30 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_CXX_MRI`] +[heading `BOOST_COMP_MRI`] [@http://www.mentor.com/microtec/ Microtec C/C++] compiler. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_CXX_MRI BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_COMP_MRI BOOST_VERSION_NUMBER(0,0,0) #if defined(_MRI) - #undef BOOST_CXX_MRI - #define BOOST_CXX_MRI BOOST_VERSION_NUMBER(0,0,1) +# undef BOOST_COMP_MRI +# define BOOST_COMP_MRI BOOST_VERSION_NUMBER(0,0,1) #endif +#define BOOST_COMP_MRI_NAME "Microtec C/C++" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_MRI,"Microtec C/C++") +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_MRI,BOOST_COMP_MRI_NAME) + #endif diff --git a/boost/predef/compiler/mingw.h b/boost/predef/compiler/mingw.h index d9b5c4f..44ba18d 100644 --- a/boost/predef/compiler/mingw.h +++ b/boost/predef/compiler/mingw.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,29 +12,40 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_CXX_MINGW`] +[heading `BOOST_COMP_MINGW`] [@http://en.wikipedia.org/wiki/MinGW MinGW] compiler. Version number available as major, minor, and patch. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_CXX_MINGW BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_COMP_MINGW BOOST_VERSION_NUMBER(0,0,0) #if defined(__MINGW32__) || defined(__MINGW64__) - #include <_mingw.h> - #undef BOOST_CXX_MINGW - #if defined(__MINGW64_VERSION_MAJOR) && defined(__MINGW64_VERSION_MINOR) - #define BOOST_CXX_MINGW \ +# include <_mingw.h> +# undef BOOST_COMP_MINGW +# if defined(__MINGW64_VERSION_MAJOR) && defined(__MINGW64_VERSION_MINOR) +# define BOOST_COMP_MINGW \ BOOST_VERSION_NUMBER(__MINGW64_VERSION_MAJOR,__MINGW64_VERSION_MINOR,0) - #elif defined(__MINGW32_VERSION_MAJOR) && defined(__MINGW32_VERSION_MINOR) - #define BOOST_CXX_MINGW \ +# elif defined(__MINGW32_VERSION_MAJOR) && defined(__MINGW32_VERSION_MINOR) +# define BOOST_COMP_MINGW \ BOOST_VERSION_NUMBER(__MINGW32_MAJOR_VERSION,__MINGW32_MINOR_VERSION,0) - #else - #define BOOST_CXX_MINGW BOOST_VERSION_NUMBER(0,0,1) - #endif +# else +# define BOOST_COMP_MINGW BOOST_VERSION_NUMBER(0,0,1) +# endif #endif +#define BOOST_COMP_MINGW_NAME "MinGW" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_MINGW,"MinGW") +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_MINGW,BOOST_COMP_MINGW_NAME) + #endif diff --git a/boost/predef/compiler/mpw.h b/boost/predef/compiler/mpw.h index fa85696..564ca90 100644 --- a/boost/predef/compiler/mpw.h +++ b/boost/predef/compiler/mpw.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,24 +12,35 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_CXX_MPW`] +[heading `BOOST_COMP_MPW`] [@http://en.wikipedia.org/wiki/Macintosh_Programmer%27s_Workshop MPW C++] compiler. Version number available as major, and minor. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_CXX_MPW BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_COMP_MPW BOOST_VERSION_NUMBER(0,0,0) #if defined(__MRC__) || defined(MPW_C) || defined(MPW_CPLUS) - #undef BOOST_CXX_MPW - #if defined(__MRC__) - #define BOOST_CXX_MPW BOOST_PREDEF_MAKE_FF_FF(__MRC__) - #else - #define BOOST_CXX_MPW BOOST_VERSION_NUMBER(0,0,1) - #endif +# undef BOOST_COMP_MPW +# if defined(__MRC__) +# define BOOST_COMP_MPW BOOST_PREDEF_MAKE_0X_VVRR(__MRC__) +# else +# define BOOST_COMP_MPW BOOST_VERSION_NUMBER(0,0,1) +# endif #endif +#define BOOST_COMP_MPW_NAME "MPW C++" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_MPW,"MPW C++") +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_MPW,BOOST_COMP_MPW_NAME) + #endif diff --git a/boost/predef/compiler/palm.h b/boost/predef/compiler/palm.h index d0722b5..6ad0aed 100644 --- a/boost/predef/compiler/palm.h +++ b/boost/predef/compiler/palm.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,20 +12,31 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_CXX_PALM`] +[heading `BOOST_COMP_PALM`] Palm C/C++ compiler. Version number available as major, minor, and patch. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_CXX_PALM BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_COMP_PALM BOOST_VERSION_NUMBER(0,0,0) #if defined(_PACC_VER) - #undef BOOST_CXX_PALM - #define BOOST_CXX_PALM BOOST_PREDEF_MAKE_F_FF_FF_000(_PACC_VER) +# undef BOOST_COMP_PALM +# define BOOST_COMP_PALM BOOST_PREDEF_MAKE_0X_VRRPP000(_PACC_VER) #endif +#define BOOST_COMP_PALM_NAME "Palm C/C++" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_PALM,"Palm C/C++") +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_PALM,BOOST_COMP_PALM_NAME) + #endif diff --git a/boost/predef/compiler/pgi.h b/boost/predef/compiler/pgi.h index cfc7e3e..f017b52 100644 --- a/boost/predef/compiler/pgi.h +++ b/boost/predef/compiler/pgi.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,23 +12,34 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_CXX_PGI`] +[heading `BOOST_COMP_PGI`] [@http://en.wikipedia.org/wiki/The_Portland_Group Portland Group C/C++] compiler. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_CXX_PGI BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_COMP_PGI BOOST_VERSION_NUMBER(0,0,0) #if defined(__PGI) - #undef BOOST_CXX_PGI - #if defined(__PGIC__) && defined(__PGIC_MINOR__) && defined(__PGIC_PATCHLEVEL__) - #define BOOST_CXX_PGI BOOST_VERSION_NUMBER(__PGIC__,__PGIC_MINOR__,__PGIC_PATCHLEVEL__) - #else - #define BOOST_CXX_PGI BOOST_VERSION_NUMBER(0,0,1) - #endif +# undef BOOST_COMP_PGI +# if defined(__PGIC__) && defined(__PGIC_MINOR__) && defined(__PGIC_PATCHLEVEL__) +# define BOOST_COMP_PGI BOOST_VERSION_NUMBER(__PGIC__,__PGIC_MINOR__,__PGIC_PATCHLEVEL__) +# else +# define BOOST_COMP_PGI BOOST_VERSION_NUMBER(0,0,1) +# endif #endif +#define BOOST_COMP_PGI_NAME "Portland Group C/C++" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_PGI,"Portland Group C/C++") +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_PGI,BOOST_COMP_PGI_NAME) + #endif diff --git a/boost/predef/compiler/sgi_mipspro.h b/boost/predef/compiler/sgi_mipspro.h index 2b5b8fa..1640500 100644 --- a/boost/predef/compiler/sgi_mipspro.h +++ b/boost/predef/compiler/sgi_mipspro.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,26 +12,37 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_CXX_SGI`] +[heading `BOOST_COMP_SGI`] [@http://en.wikipedia.org/wiki/MIPSpro SGI MIPSpro] compiler. Version number available as major, minor, and patch. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_CXX_SGI BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_COMP_SGI BOOST_VERSION_NUMBER(0,0,0) #if defined(__sgi) || defined(sgi) - #undef BOOST_CXX_SGI - #if defined(_SGI_COMPILER_VERSION) - #define BOOST_CXX_SGI BOOST_PREDEF_MAKE_N_N_N(_SGI_COMPILER_VERSION) - #elif defined(_COMPILER_VERSION) - #define BOOST_CXX_SGI BOOST_PREDEF_MAKE_N_N_N(_COMPILER_VERSION) - #else - #define BOOST_CXX_SGI BOOST_VERSION_NUMBER(0,0,1) - #endif +# undef BOOST_COMP_SGI +# if defined(_SGI_COMPILER_VERSION) +# define BOOST_COMP_SGI BOOST_PREDEF_MAKE_10_VRP(_SGI_COMPILER_VERSION) +# elif defined(_COMPILER_VERSION) +# define BOOST_COMP_SGI BOOST_PREDEF_MAKE_10_VRP(_COMPILER_VERSION) +# else +# define BOOST_COMP_SGI BOOST_VERSION_NUMBER(0,0,1) +# endif #endif +#define BOOST_COMP_SGI_NAME "SGI MIPSpro" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_SGI,"SGI MIPSpro") +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_SGI,BOOST_COMP_SGI_NAME) + #endif diff --git a/boost/predef/compiler/sunpro.h b/boost/predef/compiler/sunpro.h index a5078ab..4d849e2 100644 --- a/boost/predef/compiler/sunpro.h +++ b/boost/predef/compiler/sunpro.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,26 +12,37 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_CXX_SUNPRO`] +[heading `BOOST_COMP_SUNPRO`] [@http://en.wikipedia.org/wiki/Sun_Studio_%28software%29 Sun Studio] compiler. Version number available as major, minor, and patch. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_CXX_SUNPRO BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_COMP_SUNPRO BOOST_VERSION_NUMBER(0,0,0) #if defined(__SUNPRO_CC) || defined(__SUNPRO_C) - #undef BOOST_CXX_SUNPRO - #if defined(__SUNPRO_CC) - #define BOOST_CXX_SUNPRO BOOST_PREDEF_MAKE_F_F_F(__SUNPRO_CC) - #elif defined(__SUNPRO_C) - #define BOOST_CXX_SUNPRO BOOST_PREDEF_MAKE_F_F_F(__SUNPRO_C) - #else - #define BOOST_CXX_SUNPRO BOOST_VERSION_NUMBER(0,0,1) - #endif +# undef BOOST_COMP_SUNPRO +# if defined(__SUNPRO_CC) +# define BOOST_COMP_SUNPRO BOOST_PREDEF_MAKE_0X_VRP(__SUNPRO_CC) +# elif defined(__SUNPRO_C) +# define BOOST_COMP_SUNPRO BOOST_PREDEF_MAKE_0X_VRP(__SUNPRO_C) +# else +# define BOOST_COMP_SUNPRO BOOST_VERSION_NUMBER(0,0,1) +# endif #endif +#define BOOST_COMP_SUNPRO_NAME "Sun Studio" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_SUNPRO,"Sun Studio") +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_SUNPRO,BOOST_COMP_SUNPRO_NAME) + #endif diff --git a/boost/predef/compiler/tendra.h b/boost/predef/compiler/tendra.h index 8f3b9f5..d158070 100644 --- a/boost/predef/compiler/tendra.h +++ b/boost/predef/compiler/tendra.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,19 +12,30 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_CXX_TENDRA`] +[heading `BOOST_COMP_TENDRA`] [@http://en.wikipedia.org/wiki/TenDRA_Compiler TenDRA C/C++] compiler. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_CXX_TENDRA BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_COMP_TENDRA BOOST_VERSION_NUMBER(0,0,0) #if defined(__TenDRA__) - #undef BOOST_CXX_TENDRA - #define BOOST_CXX_TENDRA BOOST_VERSION_NUMBER(0,0,1) +# undef BOOST_COMP_TENDRA +# define BOOST_COMP_TENDRA BOOST_VERSION_NUMBER(0,0,1) #endif +#define BOOST_COMP_TENDRA_NAME "TenDRA C/C++" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_TENDRA,"TenDRA C/C++") +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_TENDRA,BOOST_COMP_TENDRA_NAME) + #endif diff --git a/boost/predef/compiler/visualc.h b/boost/predef/compiler/visualc.h index 1f55964..5e45fe2 100644 --- a/boost/predef/compiler/visualc.h +++ b/boost/predef/compiler/visualc.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,37 +12,48 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_CXX_MSVC`] +[heading `BOOST_COMP_MSVC`] [@http://en.wikipedia.org/wiki/Visual_studio Microsoft Visual C/C++] compiler. Version number available as major, minor, and patch. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_CXX_MSVC BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_COMP_MSVC BOOST_VERSION_NUMBER(0,0,0) #if defined(_MSC_VER) - #undef BOOST_CXX_MSVC - #if !defined (_MSC_FULL_VER) - #define BOOST_CXX_MSVC_BUILD 0 - #else +# undef BOOST_COMP_MSVC +# if !defined (_MSC_FULL_VER) +# define BOOST_COMP_MSVC_BUILD 0 +# else /* how many digits does the build number have? */ - #if _MSC_FULL_VER / 10000 == _MSC_VER +# if _MSC_FULL_VER / 10000 == _MSC_VER /* four digits */ - #define BOOST_CXX_MSVC_BUILD (_MSC_FULL_VER % 10000) - #elif _MSC_FULL_VER / 100000 == _MSC_VER +# define BOOST_COMP_MSVC_BUILD (_MSC_FULL_VER % 10000) +# elif _MSC_FULL_VER / 100000 == _MSC_VER /* five digits */ - #define BOOST_CXX_MSVC_BUILD (_MSC_FULL_VER % 100000) - #else - #error "Cannot determine build number from _MSC_FULL_VER" - #endif - #endif - #define BOOST_CXX_MSVC BOOST_VERSION_NUMBER(\ +# define BOOST_COMP_MSVC_BUILD (_MSC_FULL_VER % 100000) +# else +# error "Cannot determine build number from _MSC_FULL_VER" +# endif +# endif +# define BOOST_COMP_MSVC BOOST_VERSION_NUMBER(\ _MSC_VER/100-6,\ _MSC_VER%100,\ - BOOST_CXX_MSVC_BUILD) + BOOST_COMP_MSVC_BUILD) #endif +#define BOOST_COMP_MSVC_NAME "Microsoft Visual C/C++" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_MSVC,"Microsoft Visual C/C++") +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_MSVC,BOOST_COMP_MSVC_NAME) + #endif diff --git a/boost/predef/compiler/watcom.h b/boost/predef/compiler/watcom.h index 20a39ac..9612acb 100644 --- a/boost/predef/compiler/watcom.h +++ b/boost/predef/compiler/watcom.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,20 +12,31 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_CXX_WATCOM`] +[heading `BOOST_COMP_WATCOM`] [@http://en.wikipedia.org/wiki/Watcom Watcom C++] compiler. Version number available as major, and minor. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_CXX_WATCOM BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_COMP_WATCOM BOOST_VERSION_NUMBER(0,0,0) #if defined(__WATCOMC__) - #undef BOOST_CXX_WATCOM - #define BOOST_CXX_WATCOM BOOST_PREDEF_MAKE_NN_NN(__WATCOMC__) +# undef BOOST_COMP_WATCOM +# define BOOST_COMP_WATCOM BOOST_PREDEF_MAKE_10_VVRR(__WATCOMC__) #endif +#define BOOST_COMP_WATCOM_NAME "Watcom C++" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_WATCOM,"Watcom C++") +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_WATCOM,BOOST_COMP_WATCOM_NAME) + #endif diff --git a/boost/predef/detail/_cassert.h b/boost/predef/detail/_cassert.h index 41f5ec4..ca594a8 100644 --- a/boost/predef/detail/_cassert.h +++ b/boost/predef/detail/_cassert.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2011 +Copyright Redshift Software, Inc. 2011-2012 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) diff --git a/boost/predef/detail/_exception.h b/boost/predef/detail/_exception.h index f0d7f48..183dae7 100644 --- a/boost/predef/detail/_exception.h +++ b/boost/predef/detail/_exception.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2011 +Copyright Redshift Software, Inc. 2011-2012 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) diff --git a/boost/predef/detail/test.h b/boost/predef/detail/test.h index 6b17215..c75eccc 100644 --- a/boost/predef/detail/test.h +++ b/boost/predef/detail/test.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software Inc. 2011 +Copyright Redshift Software Inc. 2011-2012 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) diff --git a/boost/predef/language.h b/boost/predef/language.h index c088fe7..6fc0cd5 100644 --- a/boost/predef/language.h +++ b/boost/predef/language.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software Inc. 2011 +Copyright Redshift Software Inc. 2011-2012 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) diff --git a/boost/predef/language/objc.h b/boost/predef/language/objc.h index b31f9be..06441df 100644 --- a/boost/predef/language/objc.h +++ b/boost/predef/language/objc.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software Inc. 2011 +Copyright Redshift Software Inc. 2011-2012 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) @@ -12,19 +12,30 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_LANGUAGE_OBJC`] +[heading `BOOST_LANG_OBJC`] [@http://en.wikipedia.org/wiki/Objective-C Objective-C] language. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_LANGUAGE_OBJC BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_LANG_OBJC BOOST_VERSION_NUMBER(0,0,0) #if defined(__OBJC__) - #undef BOOST_LANGUAGE_OBJC - #define BOOST_LANGUAGE_OBJC BOOST_VERSION_NUMBER(0,0,1) +# undef BOOST_LANG_OBJC +# define BOOST_LANG_OBJC BOOST_VERSION_NUMBER(0,0,1) #endif +#define BOOST_LANG_OBJC_NAME "Objective-C" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_LANGUAGE_OBJC,"Objective-C") +BOOST_PREDEF_DECLARE_TEST(BOOST_LANG_OBJC,BOOST_LANG_OBJC_NAME) + #endif diff --git a/boost/predef/language/stdc.h b/boost/predef/language/stdc.h index d376dba..7242432 100644 --- a/boost/predef/language/stdc.h +++ b/boost/predef/language/stdc.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software Inc. 2011 +Copyright Redshift Software Inc. 2011-2012 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) @@ -12,28 +12,39 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_LANGUAGE_STDC`] +[heading `BOOST_LANG_STDC`] [@http://en.wikipedia.org/wiki/C_(programming_language) Standard C] language. -If available, the year of the standard is detected as 0.0.YYYY. +If available, the year of the standard is detected as YYYY.1.1 from the Epoc date. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_LANGUAGE_STDC BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_LANG_STDC BOOST_VERSION_NUMBER(0,0,0) #if defined(__STDC__) - #undef BOOST_LANGUAGE_STDC - #if defined(__STDC_VERSION__) - #if (__STDC_VERSION__ > 100) - #define BOOST_LANGUAGE_STDC BOOST_VERSION_NUMBER(0,0,__STDC_VERSION__/100) - #else - #define BOOST_LANGUAGE_STDC BOOST_VERSION_NUMBER(0,0,1) - #endif - #else - #define BOOST_LANGUAGE_STDC BOOST_VERSION_NUMBER(0,0,1) - #endif +# undef BOOST_LANG_STDC +# if defined(__STDC_VERSION__) +# if (__STDC_VERSION__ > 100) +# define BOOST_LANG_STDC BOOST_PREDEF_MAKE_YYYY(__STDC_VERSION__) +# else +# define BOOST_LANG_STDC BOOST_VERSION_NUMBER(0,0,1) +# endif +# else +# define BOOST_LANG_STDC BOOST_VERSION_NUMBER(0,0,1) +# endif #endif +#define BOOST_LANG_STDC_NAME "Standard C" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_LANGUAGE_STDC,"Standard C") +BOOST_PREDEF_DECLARE_TEST(BOOST_LANG_STDC,BOOST_LANG_STDC_NAME) + #endif diff --git a/boost/predef/language/stdcpp.h b/boost/predef/language/stdcpp.h index 36b3e58..a3e3aef 100644 --- a/boost/predef/language/stdcpp.h +++ b/boost/predef/language/stdcpp.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software Inc. 2011 +Copyright Redshift Software Inc. 2011-2012 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) @@ -12,7 +12,7 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_LANGUAGE_STDCPP`] +[heading `BOOST_LANG_STDCPP`] [@http://en.wikipedia.org/wiki/C%2B%2B Standard C++] language. If available, the year of the standard is detected as 0.0.YYYY. @@ -27,57 +27,74 @@ Specifically the defined versions are: [[0.0.?] [2007] [ISO/IEC TR 19768:2007]] [[0.0.2011] [2011] [ISO/IEC 14882:2011]] ] + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_LANGUAGE_STDCPP BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_LANG_STDCPP BOOST_VERSION_NUMBER(0,0,0) #if defined(__cplusplus) - #undef BOOST_LANGUAGE_STDCPP - #if (__cplusplus > 100) - #define BOOST_LANGUAGE_STDCPP BOOST_VERSION_NUMBER(0,0,__cplusplus/100) - #else - #define BOOST_LANGUAGE_STDCPP BOOST_VERSION_NUMBER(0,0,1) - #endif +# undef BOOST_LANG_STDCPP +# if (__cplusplus > 100) +# define BOOST_LANG_STDCPP BOOST_VERSION_NUMBER(0,0,__cplusplus/100) +# else +# define BOOST_LANG_STDCPP BOOST_VERSION_NUMBER(0,0,1) +# endif #endif +#define BOOST_LANG_STDCPP_NAME "Standard C++" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_LANGUAGE_STDCPP,"Standard C++") +BOOST_PREDEF_DECLARE_TEST(BOOST_LANG_STDCPP,BOOST_LANG_STDCPP_NAME) + /*` -[heading `BOOST_LANGUAGE_STDCPPCLI`] +[heading `BOOST_LANG_STDCPPCLI`] [@http://en.wikipedia.org/wiki/C%2B%2B/CLI Standard C++/CLI] language. If available, the year of the standard is detected as 0.0.YYYY. */ -#define BOOST_LANGUAGE_STDCPPCLI BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_LANG_STDCPPCLI BOOST_VERSION_NUMBER(0,0,0) #if defined(__cplusplus_cli) - #undef BOOST_LANGUAGE_STDCPPCLI - #if (__cplusplus_cli > 100) - #define BOOST_LANGUAGE_STDCPPCLI BOOST_VERSION_NUMBER(0,0,__cplusplus_cli/100) - #else - #define BOOST_LANGUAGE_STDCPPCLI BOOST_VERSION_NUMBER(0,0,1) - #endif +# undef BOOST_LANG_STDCPPCLI +# if (__cplusplus_cli > 100) +# define BOOST_LANG_STDCPPCLI BOOST_VERSION_NUMBER(0,0,__cplusplus_cli/100) +# else +# define BOOST_LANG_STDCPPCLI BOOST_VERSION_NUMBER(0,0,1) +# endif #endif +#define BOOST_LANG_STDCPPCLI_NAME "Standard C++/CLI" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_LANGUAGE_STDCPPCLI,"Standard C++/CLI") +BOOST_PREDEF_DECLARE_TEST(BOOST_LANG_STDCPPCLI,BOOST_LANG_STDCPPCLI_NAME) + /*` -[heading `BOOST_LANGUAGE_STDECPP`] +[heading `BOOST_LANG_STDECPP`] [@http://en.wikipedia.org/wiki/Embedded_C%2B%2B Standard Embedded C++] language. */ -#define BOOST_LANGUAGE_STDECPP BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_LANG_STDECPP BOOST_VERSION_NUMBER(0,0,0) #if defined(__embedded_cplusplus) - #undef BOOST_LANGUAGE_STDECPP - #define BOOST_LANGUAGE_STDECPP BOOST_VERSION_NUMBER(0,0,1) +# undef BOOST_LANG_STDECPP +# define BOOST_LANG_STDECPP BOOST_VERSION_NUMBER(0,0,1) #endif +#define BOOST_LANG_STDECPP_NAME "Standard Embedded C++" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_LANGUAGE_STDECPP,"Standard Embedded C++") +BOOST_PREDEF_DECLARE_TEST(BOOST_LANG_STDECPP,BOOST_LANG_STDECPP_NAME) + #endif diff --git a/boost/predef/library.h b/boost/predef/library.h index 6504bbc..8b29c05 100644 --- a/boost/predef/library.h +++ b/boost/predef/library.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2010 +Copyright Redshift Software, Inc. 2008-2012 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) diff --git a/boost/predef/library/c.h b/boost/predef/library/c.h index fac9784..18cafe0 100644 --- a/boost/predef/library/c.h +++ b/boost/predef/library/c.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2010 +Copyright Redshift Software, Inc. 2008-2012 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) diff --git a/boost/predef/library/c/gnu.h b/boost/predef/library/c/gnu.h index fcf7a93..9176167 100644 --- a/boost/predef/library/c/gnu.h +++ b/boost/predef/library/c/gnu.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -18,26 +18,37 @@ http://www.boost.org/LICENSE_1_0.txt) #endif /*` -[heading `BOOST_LIBC_GNU`] +[heading `BOOST_LIB_C_GNU`] [@http://en.wikipedia.org/wiki/Glibc GNU glibc] Standard C library. Version number available as major, and minor. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_LIBC_GNU BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_LIB_C_GNU BOOST_VERSION_NUMBER(0,0,0) #if defined(__GLIBC__) || defined(__GNU_LIBRARY__) - #undef BOOST_LIBC_GNU - #if defined(__GLIBC__) - #define BOOST_LIBC_GNU \ +# undef BOOST_LIB_C_GNU +# if defined(__GLIBC__) +# define BOOST_LIB_C_GNU \ BOOST_VERSION_NUMBER(__GLIBC__,__GLIBC_MINOR__,0) - #else - #define BOOST_LIBC_GNU \ +# else +# define BOOST_LIB_C_GNU \ BOOST_VERSION_NUMBER(__GNU_LIBRARY__,__GNU_LIBRARY_MINOR__,0) - #endif +# endif #endif +#define BOOST_LIB_C_GNU_NAME "GNU" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_LIBC_GNU,"GNU") +BOOST_PREDEF_DECLARE_TEST(BOOST_LIB_C_GNU,BOOST_LIB_C_GNU_NAME) + #endif diff --git a/boost/predef/library/c/uc.h b/boost/predef/library/c/uc.h index 7b828c1..a270cbb 100644 --- a/boost/predef/library/c/uc.h +++ b/boost/predef/library/c/uc.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,21 +12,32 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_LIBC_UC`] +[heading `BOOST_LIB_C_UC`] [@http://en.wikipedia.org/wiki/Uclibc uClibc] Standard C library. Version number available as major, minor, and patch. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_LIBC_UC BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_LIB_C_UC BOOST_VERSION_NUMBER(0,0,0) #if defined(__UCLIBC__) - #undef BOOST_LIBC_UC - #define BOOST_LIBC_UC BOOST_VERSION_NUMBER(\ +# undef BOOST_LIB_C_UC +# define BOOST_LIB_C_UC BOOST_VERSION_NUMBER(\ __UCLIBC_MAJOR__,__UCLIBC_MINOR__,__UCLIBC_SUBLEVEL__) #endif +#define BOOST_LIB_C_UC_NAME "uClibc" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_LIBC_UC,"uClibc") +BOOST_PREDEF_DECLARE_TEST(BOOST_LIB_C_UC,BOOST_LIB_C_UC_NAME) + #endif diff --git a/boost/predef/library/c/vms.h b/boost/predef/library/c/vms.h index b3d28f0..d360122 100644 --- a/boost/predef/library/c/vms.h +++ b/boost/predef/library/c/vms.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,20 +12,31 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_LIBC_VMS`] +[heading `BOOST_LIB_C_VMS`] VMS libc Standard C library. Version number available as major, minor, and patch. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_LIBC_VMS BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_LIB_C_VMS BOOST_VERSION_NUMBER(0,0,0) #if defined(__CRTL_VER) - #undef BOOST_LIBC_VMS - #define BOOST_LIBC_VMS BOOST_PREDEF_MAKE_NN_NN_0_NN_00(__CRTL_VER) +# undef BOOST_LIB_C_VMS +# define BOOST_LIB_C_VMS BOOST_PREDEF_MAKE_10_VVRR0PP00(__CRTL_VER) #endif +#define BOOST_LIB_C_VMS_NAME "VMS" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_LIBC_VMS,"VMS") +BOOST_PREDEF_DECLARE_TEST(BOOST_LIB_C_VMS,BOOST_LIB_C_VMS_NAME) + #endif diff --git a/boost/predef/library/c/zos.h b/boost/predef/library/c/zos.h index bb8bcd3..5613a3c 100644 --- a/boost/predef/library/c/zos.h +++ b/boost/predef/library/c/zos.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,26 +12,37 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_LIBC_ZOS`] +[heading `BOOST_LIB_C_ZOS`] z/OS libc Standard C library. Version number available as major, minor, and patch. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_LIBC_ZOS BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_LIB_C_ZOS BOOST_VERSION_NUMBER(0,0,0) #if defined(__LIBREL__) - #undef BOOST_LIBC_ZOS - #if defined(__LIBREL__) - #define BOOST_LIBC_ZOS BOOST_PREDEF_MAKE_F_FF_FFFF(__LIBREL__) - #elif defined(__TARGET_LIB__) - #define BOOST_LIBC_ZOS BOOST_PREDEF_MAKE_F_FF_FFFF(__TARGET_LIB__) - #else - #define BOOST_LIBC_ZOS BOOST_VERSION_NUMBER(0,0,1) - #endif +# undef BOOST_LIB_C_ZOS +# if defined(__LIBREL__) +# define BOOST_LIB_C_ZOS BOOST_PREDEF_MAKE_0X_VRRPPPP(__LIBREL__) +# elif defined(__TARGET_LIB__) +# define BOOST_LIB_C_ZOS BOOST_PREDEF_MAKE_0X_VRRPPPP(__TARGET_LIB__) +# else +# define BOOST_LIB_C_ZOS BOOST_VERSION_NUMBER(0,0,1) +# endif #endif +#define BOOST_LIB_C_ZOS_NAME "z/OS" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_LIBC_ZOS,"z/OS") +BOOST_PREDEF_DECLARE_TEST(BOOST_LIB_C_ZOS,BOOST_LIB_C_ZOS_NAME) + #endif diff --git a/boost/predef/library/std.h b/boost/predef/library/std.h index d9b947f..e6582ec 100644 --- a/boost/predef/library/std.h +++ b/boost/predef/library/std.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) diff --git a/boost/predef/library/std/cxx.h b/boost/predef/library/std/cxx.h index de83c6a..da46c07 100644 --- a/boost/predef/library/std/cxx.h +++ b/boost/predef/library/std/cxx.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software Inc 2011 +Copyright Redshift Software Inc 2011-2012 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) @@ -12,20 +12,31 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_LIBSTD_CXX`] +[heading `BOOST_LIB_STD_CXX`] [@http://libcxx.llvm.org/ libc++] C++ Standard Library. If available version number as major, minor, and patch. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_LIBSTD_CXX BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_LIB_STD_CXX BOOST_VERSION_NUMBER(0,0,0) #if defined(_LIBCPP_VERSION) - #undef BOOST_LIBSTD_CXX - #define BOOST_LIBSTD_CXX BOOST_PREDEF_MAKE_N__NNN(_LIBCPP_VERSION) +# undef BOOST_LIB_STD_CXX +# define BOOST_LIB_STD_CXX BOOST_PREDEF_MAKE_10_VPPP(_LIBCPP_VERSION) #endif +#define BOOST_LIB_STD_CXX_NAME "libc++" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_LIBSTD_CXX,"libc++") +BOOST_PREDEF_DECLARE_TEST(BOOST_LIB_STD_CXX,BOOST_LIB_STD_CXX_NAME) + #endif diff --git a/boost/predef/library/std/dinkumware.h b/boost/predef/library/std/dinkumware.h index b9e8f0a..2bbd685 100644 --- a/boost/predef/library/std/dinkumware.h +++ b/boost/predef/library/std/dinkumware.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,24 +12,35 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_LIBSTD_DINKUMWARE`] +[heading `BOOST_LIB_STD_DINKUMWARE`] [@http://en.wikipedia.org/wiki/Dinkumware Dinkumware] Standard C++ Library. If available version number as major, minor, and patch. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_LIBSTD_DINKUMWARE BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_LIB_STD_DINKUMWARE BOOST_VERSION_NUMBER(0,0,0) #if (defined(_YVALS) && !defined(__IBMCPP__)) || defined(_CPPLIB_VER) - #undef BOOST_LIBSTD_DINKUMWARE - #if defined(_CPPLIB_VER) - #define BOOST_LIBSTD_DINKUMWARE BOOST_PREDEF_MAKE_NN_NN(_CPPLIB_VER) - #else - #define BOOST_LIBSTD_DINKUMWARE BOOST_VERSION_NUMBER(0,0,1) - #endif +# undef BOOST_LIB_STD_DINKUMWARE +# if defined(_CPPLIB_VER) +# define BOOST_LIB_STD_DINKUMWARE BOOST_PREDEF_MAKE_10_VVRR(_CPPLIB_VER) +# else +# define BOOST_LIB_STD_DINKUMWARE BOOST_VERSION_NUMBER(0,0,1) +# endif #endif +#define BOOST_LIB_STD_DINKUMWARE_NAME "Dinkumware" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_LIBSTD_DINKUMWARE,"Dinkumware") +BOOST_PREDEF_DECLARE_TEST(BOOST_LIB_STD_DINKUMWARE,BOOST_LIB_STD_DINKUMWARE_NAME) + #endif diff --git a/boost/predef/library/std/libcomo.h b/boost/predef/library/std/libcomo.h index 693856e..0bcb296 100644 --- a/boost/predef/library/std/libcomo.h +++ b/boost/predef/library/std/libcomo.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,20 +12,31 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_LIBSTD_COMO`] +[heading `BOOST_LIB_STD_COMO`] [@http://www.comeaucomputing.com/libcomo/ Comeau Computing] Standard C++ Library. Version number available as major. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_LIBSTD_COMO BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_LIB_STD_COMO BOOST_VERSION_NUMBER(0,0,0) #if defined(__LIBCOMO__) - #undef BOOST_LIBSTD_COMO - #define BOOST_LIBSTD_COMO BOOST_VERSION_NUMBER(__LIBCOMO_VERSION__,0,0) +# undef BOOST_LIB_STD_COMO +# define BOOST_LIB_STD_COMO BOOST_VERSION_NUMBER(__LIBCOMO_VERSION__,0,0) #endif +#define BOOST_LIB_STD_COMO_NAME "Comeau Computing" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_LIBSTD_COMO,"Comeau Computing") +BOOST_PREDEF_DECLARE_TEST(BOOST_LIB_STD_COMO,BOOST_LIB_STD_COMO_NAME) + #endif diff --git a/boost/predef/library/std/modena.h b/boost/predef/library/std/modena.h index 660137d..ab20eec 100644 --- a/boost/predef/library/std/modena.h +++ b/boost/predef/library/std/modena.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,19 +12,30 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_LIBSTD_MSIPL`] +[heading `BOOST_LIB_STD_MSIPL`] [@http://modena.us/ Modena Software Lib++] Standard C++ Library. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_LIBSTD_MSIPL BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_LIB_STD_MSIPL BOOST_VERSION_NUMBER(0,0,0) #if defined(MSIPL_COMPILE_H) || defined(__MSIPL_COMPILE_H) - #undef BOOST_LIBSTD_MSIPL - #define BOOST_LIBSTD_MSIPL BOOST_VERSION_NUMBER(0,0,1) +# undef BOOST_LIB_STD_MSIPL +# define BOOST_LIB_STD_MSIPL BOOST_VERSION_NUMBER(0,0,1) #endif +#define BOOST_LIB_STD_MSIPL_NAME "Modena Software Lib++" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_LIBSTD_MSIPL,"Modena Software Lib++") +BOOST_PREDEF_DECLARE_TEST(BOOST_LIB_STD_MSIPL,BOOST_LIB_STD_MSIPL_NAME) + #endif diff --git a/boost/predef/library/std/msl.h b/boost/predef/library/std/msl.h index b3d259c..c303c1a 100644 --- a/boost/predef/library/std/msl.h +++ b/boost/predef/library/std/msl.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,24 +12,35 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_LIBSTD_MSL`] +[heading `BOOST_LIB_STD_MSL`] [@http://www.freescale.com/ Metrowerks] Standard C++ Library. Version number available as major, minor, and patch. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_LIBSTD_MSL BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_LIB_STD_MSL BOOST_VERSION_NUMBER(0,0,0) #if defined(__MSL_CPP__) || defined(__MSL__) - #undef BOOST_LIBSTD_MSL - #if defined(__MSL_CPP__) - #define BOOST_LIBSTD_MSL BOOST_PREDEF_MAKE_F_F_FF(__MSL_CPP__) - #else - #define BOOST_LIBSTD_MSL BOOST_PREDEF_MAKE_F_F_FF(__MSL__) - #endif +# undef BOOST_LIB_STD_MSL +# if defined(__MSL_CPP__) +# define BOOST_LIB_STD_MSL BOOST_PREDEF_MAKE_0X_VRPP(__MSL_CPP__) +# else +# define BOOST_LIB_STD_MSL BOOST_PREDEF_MAKE_0X_VRPP(__MSL__) +# endif #endif +#define BOOST_LIB_STD_MSL_NAME "Metrowerks" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_LIBSTD_MSL,"Metrowerks") +BOOST_PREDEF_DECLARE_TEST(BOOST_LIB_STD_MSL,BOOST_LIB_STD_MSL_NAME) + #endif diff --git a/boost/predef/library/std/roguewave.h b/boost/predef/library/std/roguewave.h index c8cce21..6477d10 100644 --- a/boost/predef/library/std/roguewave.h +++ b/boost/predef/library/std/roguewave.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,28 +12,39 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_LIBSTD_RW`] +[heading `BOOST_LIB_STD_RW`] [@http://stdcxx.apache.org/ Roguewave] Standard C++ library. If available version number as major, minor, and patch. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_LIBSTD_RW BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_LIB_STD_RW BOOST_VERSION_NUMBER(0,0,0) #if defined(__STD_RWCOMPILER_H__) || defined(_RWSTD_VER) - #undef BOOST_LIBSTD_RW - #if defined(_RWSTD_VER) - #if _RWSTD_VER < 0x010000 - #define BOOST_LIBSTD_RW BOOST_PREDEF_MAKE_FF_FF_F(_RWSTD_VER) - #else - #define BOOST_LIBSTD_RW BOOST_PREDEF_MAKE_FF_FF_FF(_RWSTD_VER) - #endif - #else - #define BOOST_LIBSTD_RW BOOST_VERSION_NUMBER(0,0,1) - #endif +# undef BOOST_LIB_STD_RW +# if defined(_RWSTD_VER) +# if _RWSTD_VER < 0x010000 +# define BOOST_LIB_STD_RW BOOST_PREDEF_MAKE_0X_VVRRP(_RWSTD_VER) +# else +# define BOOST_LIB_STD_RW BOOST_PREDEF_MAKE_FF_FF_FF(_RWSTD_VER) +# endif +# else +# define BOOST_LIB_STD_RW BOOST_VERSION_NUMBER(0,0,1) +# endif #endif +#define BOOST_LIB_STD_RW_NAME "Roguewave" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_LIBSTD_RW,"Roguewave") +BOOST_PREDEF_DECLARE_TEST(BOOST_LIB_STD_RW,BOOST_LIB_STD_RW_NAME) + #endif diff --git a/boost/predef/library/std/sgi.h b/boost/predef/library/std/sgi.h index 21b6b02..19416bc 100644 --- a/boost/predef/library/std/sgi.h +++ b/boost/predef/library/std/sgi.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,24 +12,35 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_LIBSTD_SGI`] +[heading `BOOST_LIB_STD_SGI`] [@http://www.sgi.com/tech/stl/ SGI] Standard C++ library. If available version number as major, minor, and patch. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_LIBSTD_SGI BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_LIB_STD_SGI BOOST_VERSION_NUMBER(0,0,0) #if defined(__STL_CONFIG_H) - #undef BOOST_LIBSTD_SGI - #if defined(__SGI_STL) - #define BOOST_LIBSTD_SGI BOOST_PREDEF_MAKE_F_F_F(__SGI_STL) - #else - #define BOOST_LIBSTD_SGI BOOST_VERSION_NUMBER(0,0,1) - #endif +# undef BOOST_LIB_STD_SGI +# if defined(__SGI_STL) +# define BOOST_LIB_STD_SGI BOOST_PREDEF_MAKE_0X_VRP(__SGI_STL) +# else +# define BOOST_LIB_STD_SGI BOOST_VERSION_NUMBER(0,0,1) +# endif #endif +#define BOOST_LIB_STD_SGI_NAME "SGI" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_LIBSTD_SGI,"SGI") +BOOST_PREDEF_DECLARE_TEST(BOOST_LIB_STD_SGI,BOOST_LIB_STD_SGI_NAME) + #endif diff --git a/boost/predef/library/std/stdcpp3.h b/boost/predef/library/std/stdcpp3.h index d33811c..d61625b 100644 --- a/boost/predef/library/std/stdcpp3.h +++ b/boost/predef/library/std/stdcpp3.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,24 +12,35 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_LIBSTD_GNU`] +[heading `BOOST_LIB_STD_GNU`] [@http://gcc.gnu.org/libstdc++/ GNU libstdc++] Standard C++ library. Version number available as year (from 1970), month, and day. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_LIBSTD_GNU BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_LIB_STD_GNU BOOST_VERSION_NUMBER(0,0,0) #if defined(__GLIBCPP__) || defined(__GLIBCXX__) - #undef BOOST_LIBSTD_GNU - #if defined(__GLIBCXX__) - #define BOOST_LIBSTD_GNU BOOST_PREDEF_MAKE_YYYY_MM_DD(__GLIBCXX__) - #else - #define BOOST_LIBSTD_GNU BOOST_PREDEF_MAKE_YYYY_MM_DD(__GLIBCPP__) - #endif +# undef BOOST_LIB_STD_GNU +# if defined(__GLIBCXX__) +# define BOOST_LIB_STD_GNU BOOST_PREDEF_MAKE_YYYYMMDD(__GLIBCXX__) +# else +# define BOOST_LIB_STD_GNU BOOST_PREDEF_MAKE_YYYYMMDD(__GLIBCPP__) +# endif #endif +#define BOOST_LIB_STD_GNU_NAME "GNU" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_LIBSTD_GNU,"GNU") +BOOST_PREDEF_DECLARE_TEST(BOOST_LIB_STD_GNU,BOOST_LIB_STD_GNU_NAME) + #endif diff --git a/boost/predef/library/std/stlport.h b/boost/predef/library/std/stlport.h index 00c87a0..ef1cda9 100644 --- a/boost/predef/library/std/stlport.h +++ b/boost/predef/library/std/stlport.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,27 +12,38 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_LIBSTD_STLPORT`] +[heading `BOOST_LIB_STD_STLPORT`] [@http://sourceforge.net/projects/stlport/ STLport Standard C++] library. Version number available as major, minor, and patch. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_LIBSTD_STLPORT BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_LIB_STD_STLPORT BOOST_VERSION_NUMBER(0,0,0) #if defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION) - #undef BOOST_LIBSTD_STLPORT - #if defined(_STLPORT_MAJOR) - #define BOOST_LIBSTD_STLPORT \ +# undef BOOST_LIB_STD_STLPORT +# if defined(_STLPORT_MAJOR) +# define BOOST_LIB_STD_STLPORT \ BOOST_VERSION_NUMBER(_STLPORT_MAJOR,_STLPORT_MINOR,_STLPORT_PATCHLEVEL) - #elif defined(_STLPORT_VERSION) - #define BOOST_LIBSTD_STLPORT BOOST_PREDEF_MAKE_F_F_F(_STLPORT_VERSION) - #else - #define BOOST_LIBSTD_STLPORT BOOST_PREDEF_MAKE_F_F_F(__SGI_STL_PORT) - #endif +# elif defined(_STLPORT_VERSION) +# define BOOST_LIB_STD_STLPORT BOOST_PREDEF_MAKE_0X_VRP(_STLPORT_VERSION) +# else +# define BOOST_LIB_STD_STLPORT BOOST_PREDEF_MAKE_0X_VRP(__SGI_STL_PORT) +# endif #endif +#define BOOST_LIB_STD_STLPORT_NAME "STLport" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_LIBSTD_STLPORT,"STLport") +BOOST_PREDEF_DECLARE_TEST(BOOST_LIB_STD_STLPORT,BOOST_LIB_STD_STLPORT_NAME) + #endif diff --git a/boost/predef/library/std/vacpp.h b/boost/predef/library/std/vacpp.h index aa1dcbe..bb9b9a6 100644 --- a/boost/predef/library/std/vacpp.h +++ b/boost/predef/library/std/vacpp.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -12,19 +12,30 @@ http://www.boost.org/LICENSE_1_0.txt) #include /*` -[heading `BOOST_LIBSTD_IBM`] +[heading `BOOST_LIB_STD_IBM`] [@http://www.ibm.com/software/awdtools/xlcpp/ IBM VACPP Standard C++] library. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ -#define BOOST_LIBSTD_IBM BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_LIB_STD_IBM BOOST_VERSION_NUMBER(0,0,0) #if defined(__IBMCPP__) - #undef BOOST_LIBSTD_IBM - #define BOOST_LIBSTD_IBM BOOST_VERSION_NUMBER(0,0,1) +# undef BOOST_LIB_STD_IBM +# define BOOST_LIB_STD_IBM BOOST_VERSION_NUMBER(0,0,1) #endif +#define BOOST_LIB_STD_IBM_NAME "IBM VACPP" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_LIBSTD_IBM,"IBM VACPP") +BOOST_PREDEF_DECLARE_TEST(BOOST_LIB_STD_IBM,BOOST_LIB_STD_IBM_NAME) + #endif diff --git a/boost/predef/make.h b/boost/predef/make.h index c05cb55..19bf1d5 100644 --- a/boost/predef/make.h +++ b/boost/predef/make.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2010 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -14,73 +14,72 @@ Shorthands for the common version number formats used by vendors... */ /*` -[heading `BOOST_PREDEF_MAKE_F..` macros] +[heading `BOOST_PREDEF_MAKE_..` macros] These set of macros decompose common vendor version number -macros which are composed of hexadecimal digits. The naming -convention indicates what the format of the vendor version -number. Where "`F`" indicates a hexadecimal digit, "`_`" -separates the major/minor/patch parts of the version number, -and "`0`" indicates an ignored hexadecimal digit. Macros are: -*/ -/*` `BOOST_PREDER_MAKE_F_F_F(V)` */ -#define BOOST_PREDEF_MAKE_F_F_F(V) BOOST_VERSION_NUMBER((V&0xF00)>>8,(V&0xF0)>>4,(V&0xF)) -/*` `BOOST_PREDEF_MAKE_FF_F_F(V)` */ -#define BOOST_PREDEF_MAKE_FF_F_F(V) BOOST_VERSION_NUMBER((V&0xFF00)>>8,(V&0xF0)>>4,(V&0xF)) -/*` `BOOST_PREDEF_MAKE_F_F_FF(V)` */ -#define BOOST_PREDEF_MAKE_F_F_FF(V) BOOST_VERSION_NUMBER((V&0xF000)>>12,(V&0xF00)>>8,(V&0xFF)) -/*` `BOOST_PREDEF_MAKE_FF_FF(V)` */ -#define BOOST_PREDEF_MAKE_FF_FF(V) BOOST_VERSION_NUMBER((V&0xFF00)>>8,(V&0xFF),0) -/*` `BOOST_PREDEF_MAKE_F_FF_FFFF(V)` */ -#define BOOST_PREDEF_MAKE_F_FF_FFFF(V) BOOST_VERSION_NUMBER((V&0xF000000)>>24,(V&0xFF0000)>>16,(V&0xFFFF)) -/*` `BOOST_PREDEF_MAKE_FF_FF_F(V)` */ -#define BOOST_PREDEF_MAKE_FF_FF_F(V) BOOST_VERSION_NUMBER((V&0xFF000)>>12,(V&0xFF0)>>4,(V&0xF)) -/*` `BOOST_PREDEF_MAKE_F_FF_FF_000(V)` */ -#define BOOST_PREDEF_MAKE_F_FF_FF_000(V) BOOST_VERSION_NUMBER((V&0xF0000000)>>28,(V&0xFF00000)>>20,(V&0xFF000)>>12) +macros which are composed version, revision, and patch digits. +The naming convention indicates: + * The base of the specified version number. "`BOOST_PREDEF_MAKE_0X`" for + hexadecimal digits, and "`BOOST_PREDEF_MAKE_10`" for decimal digits. + * The format of the vendor version number. Where "`V`" indicates the version digits, + "`R`" indicates the revision digits, "`P`" indicates the patch digits, and "`0`" + indicates an ignored digit. + +Macros are: +*/ +/*` `BOOST_PREDEF_MAKE_0X_VRP(V)` */ +#define BOOST_PREDEF_MAKE_0X_VRP(V) BOOST_VERSION_NUMBER((V&0xF00)>>8,(V&0xF0)>>4,(V&0xF)) +/*` `BOOST_PREDEF_MAKE_0X_VVRP(V)` */ +#define BOOST_PREDEF_MAKE_0X_VVRP(V) BOOST_VERSION_NUMBER((V&0xFF00)>>8,(V&0xF0)>>4,(V&0xF)) +/*` `BOOST_PREDEF_MAKE_0X_VRPP(V)` */ +#define BOOST_PREDEF_MAKE_0X_VRPP(V) BOOST_VERSION_NUMBER((V&0xF000)>>12,(V&0xF00)>>8,(V&0xFF)) +/*` `BOOST_PREDEF_MAKE_0X_VVRR(V)` */ +#define BOOST_PREDEF_MAKE_0X_VVRR(V) BOOST_VERSION_NUMBER((V&0xFF00)>>8,(V&0xFF),0) +/*` `BOOST_PREDEF_MAKE_0X_VRRPPPP(V)` */ +#define BOOST_PREDEF_MAKE_0X_VRRPPPP(V) BOOST_VERSION_NUMBER((V&0xF000000)>>24,(V&0xFF0000)>>16,(V&0xFFFF)) +/*` `BOOST_PREDEF_MAKE_0X_VVRRP(V)` */ +#define BOOST_PREDEF_MAKE_0X_VVRRP(V) BOOST_VERSION_NUMBER((V&0xFF000)>>12,(V&0xFF0)>>4,(V&0xF)) +/*` `BOOST_PREDEF_MAKE_0X_VRRPP000(V)` */ +#define BOOST_PREDEF_MAKE_0X_VRRPP000(V) BOOST_VERSION_NUMBER((V&0xF0000000)>>28,(V&0xFF00000)>>20,(V&0xFF000)>>12) +/*` `BOOST_PREDEF_MAKE_10_VPPP(V)` */ +#define BOOST_PREDEF_MAKE_10_VPPP(V) BOOST_VERSION_NUMBER(((V)/1000)%10,0,(V)%1000) +/*` `BOOST_PREDEF_MAKE_10_VRP(V)` */ +#define BOOST_PREDEF_MAKE_10_VRP(V) BOOST_VERSION_NUMBER(((V)/100)%10,((V)/10)%10,(V)%10) +/*` `BOOST_PREDEF_MAKE_10_VRP000(V)` */ +#define BOOST_PREDEF_MAKE_10_VRP000(V) BOOST_VERSION_NUMBER(((V)/100000)%10,((V)/10000)%10,((V)/1000)%10) +/*` `BOOST_PREDEF_MAKE_10_VRPP(V)` */ +#define BOOST_PREDEF_MAKE_10_VRPP(V) BOOST_VERSION_NUMBER(((V)/1000)%10,((V)/100)%10,(V)%100) +/*` `BOOST_PREDEF_MAKE_10_VRR(V)` */ +#define BOOST_PREDEF_MAKE_10_VRR(V) BOOST_VERSION_NUMBER(((V)/100)%10,(V)%100,0) +/*` `BOOST_PREDEF_MAKE_10_VRRPP(V)` */ +#define BOOST_PREDEF_MAKE_10_VRRPP(V) BOOST_VERSION_NUMBER(((V)/10000)%10,((V)/100)%100,(V)%100) +/*` `BOOST_PREDEF_MAKE_10_VRR000(V)` */ +#define BOOST_PREDEF_MAKE_10_VRR000(V) BOOST_VERSION_NUMBER(((V)/100000)%10,((V)/1000)%100,0) +/*` `BOOST_PREDEF_MAKE_10_VV00(V)` */ +#define BOOST_PREDEF_MAKE_10_VV00(V) BOOST_VERSION_NUMBER(((V)/100)%100,0,0) +/*` `BOOST_PREDEF_MAKE_10_VVRR(V)` */ +#define BOOST_PREDEF_MAKE_10_VVRR(V) BOOST_VERSION_NUMBER(((V)/100)%100,(V)%100,0) +/*` `BOOST_PREDEF_MAKE_10_VVRRPP(V)` */ +#define BOOST_PREDEF_MAKE_10_VVRRPP(V) BOOST_VERSION_NUMBER(((V)/10000)%100,((V)/100)%100,(V)%100) +/*` `BOOST_PREDEF_MAKE_10_VVRR0PP00(V)` */ +#define BOOST_PREDEF_MAKE_10_VVRR0PP00(V) BOOST_VERSION_NUMBER(((V)/10000000)%100,((V)/100000)%100,((V)/100)%100) +/*` `BOOST_PREDEF_MAKE_10_VVRR0PPPP(V)` */ +#define BOOST_PREDEF_MAKE_10_VVRR0PPPP(V) BOOST_VERSION_NUMBER(((V)/10000000)%100,((V)/100000)%100,(V)%10000) +/*` `BOOST_PREDEF_MAKE_10_VVRR00PP00(V)` */ +#define BOOST_PREDEF_MAKE_10_VVRR00PP00(V) BOOST_VERSION_NUMBER(((V)/100000000)%100,((V)/1000000)%100,((V)/100)%100) /*` -[heading `BOOST_PREDEF_MAKE_N..` macros] +[heading `BOOST_PREDEF_MAKE_*..` date macros] -These set of macros decompose common vendor version number -macros which are composed of decimal digits. The naming -convention indicates what the format of the vendor version -number. Where "`N`" indicates a decimal digit, "`_`" -separates the major/minor/patch parts of the version number, -and "`0`" indicates an ignored decimal digit. Macros are: +Date decomposition macros return a date in the relative to the 1970 +Epoch date. If the month is not available, January 1st is used as the month and day. +If the day is not available, but the month is, the 1st of the month is used as the day. */ -/*` `BOOST_PREDEF_MAKE_N__NNN(V)` */ -#define BOOST_PREDEF_MAKE_N__NNN(V) BOOST_VERSION_NUMBER(((V)/1000)%10,0,(V)%1000) -/*` `BOOST_PREDEF_MAKE_N_N_N(V)` */ -#define BOOST_PREDEF_MAKE_N_N_N(V) BOOST_VERSION_NUMBER(((V)/100)%10,((V)/10)%10,(V)%10) -/*` `BOOST_PREDEF_MAKE_N_N_N_000(V)` */ -#define BOOST_PREDEF_MAKE_N_N_N_000(V) BOOST_VERSION_NUMBER(((V)/100000)%10,((V)/10000)%10,((V)/1000)%10) -/*` `BOOST_PREDEF_MAKE_N_N_NN(V)` */ -#define BOOST_PREDEF_MAKE_N_N_NN(V) BOOST_VERSION_NUMBER(((V)/1000)%10,((V)/100)%10,(V)%100) -/*` `BOOST_PREDEF_MAKE_N_NN(V)` */ -#define BOOST_PREDEF_MAKE_N_NN(V) BOOST_VERSION_NUMBER(((V)/100)%10,(V)%100,0) -/*` `BOOST_PREDEF_MAKE_N_NN_NN(V)` */ -#define BOOST_PREDEF_MAKE_N_NN_NN(V) BOOST_VERSION_NUMBER(((V)/10000)%10,((V)/100)%100,(V)%100) -/*` `BOOST_PREDEF_MAKE_N_NN_000(V)` */ -#define BOOST_PREDEF_MAKE_N_NN_000(V) BOOST_VERSION_NUMBER(((V)/100000)%10,((V)/1000)%100,0) -/*` `BOOST_PREDEF_MAKE_NN_00(V)` */ -#define BOOST_PREDEF_MAKE_NN_00(V) BOOST_VERSION_NUMBER(((V)/100)%100,0,0) -/*` `BOOST_PREDEF_MAKE_NN_NN(V)` */ -#define BOOST_PREDEF_MAKE_NN_NN(V) BOOST_VERSION_NUMBER(((V)/100)%100,(V)%100,0) -/*` `BOOST_PREDEF_MAKE_NN_NN_NN(V)` */ -#define BOOST_PREDEF_MAKE_NN_NN_NN(V) BOOST_VERSION_NUMBER(((V)/10000)%100,((V)/100)%100,(V)%100) -/*` `BOOST_PREDEF_MAKE_NN_NN_0_NN_00(V)` */ -#define BOOST_PREDEF_MAKE_NN_NN_0_NN_00(V) BOOST_VERSION_NUMBER(((V)/10000000)%100,((V)/100000)%100,((V)/100)%100) -/*` `BOOST_PREDEF_MAKE_NN_NN_0_NNNN(V)` */ -#define BOOST_PREDEF_MAKE_NN_NN_0_NNNN(V) BOOST_VERSION_NUMBER(((V)/10000000)%100,((V)/100000)%100,(V)%10000) -/*` `BOOST_PREDEF_MAKE_NN_NN_00_NN_00(V)` */ -#define BOOST_PREDEF_MAKE_NN_NN_00_NN_00(V) BOOST_VERSION_NUMBER(((V)/100000000)%100,((V)/1000000)%100,((V)/100)%100) -/*` -`BOOST_PREDEF_MAKE_YYYY_MM_DD(V)` - -The date decomposition returns a date in the form -`BOOST_VERSION_NUMBER(YYYY-1970,MM,DD)`. I.e. a date relative to the 1970 -Epoch date. -*/ -#define BOOST_PREDEF_MAKE_YYYY_MM_DD(V) BOOST_VERSION_NUMBER(((V)/10000)%10000-1970,((V)/100)%100,(V)%100) +/*` `BOOST_PREDEF_MAKE_DATE(Y,M,D)` */ +#define BOOST_PREDEF_MAKE_DATE(Y,M,D) BOOST_VERSION_NUMBER((Y)%10000-1970,(M)%100,(D)%100) +/*` `BOOST_PREDEF_MAKE_YYYYMMDD(V)` */ +#define BOOST_PREDEF_MAKE_YYYYMMDD(V) BOOST_PREDEF_MAKE_DATE(((V)/10000)%10000,((V)/100)%100,(V)%100) +/*` `BOOST_PREDEF_MAKE_YYYY(V)` */ +#define BOOST_PREDEF_MAKE_YYYY(V) BOOST_PREDEF_MAKE_DATE(V,1,1) #endif diff --git a/boost/predef/os.h b/boost/predef/os.h index f4808f6..64edab2 100644 --- a/boost/predef/os.h +++ b/boost/predef/os.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2010 +Copyright Redshift Software, Inc. 2008-2012 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) diff --git a/boost/predef/os/aix.h b/boost/predef/os/aix.h index b266571..cd734d3 100644 --- a/boost/predef/os/aix.h +++ b/boost/predef/os/aix.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2010 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -16,26 +16,37 @@ http://www.boost.org/LICENSE_1_0.txt) [@http://en.wikipedia.org/wiki/AIX_operating_system IBM AIX] operating system. Version number available as major, minor, and patch. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ #define BOOST_OS_AIX BOOST_VERSION_NUMBER(0,0,0) #if defined(_AIX) || defined(__TOS_AIX__) - #undef BOOST_OS_AIX - #if defined(_AIX43) - #define BOOST_OS_AIX BOOST_VERSION_NUMBER(4,3,0) - #elif defined(_AIX41) - #define BOOST_OS_AIX BOOST_VERSION_NUMBER(4,1,0) - #elif defined(_AIX32) - #define BOOST_OS_AIX BOOST_VERSION_NUMBER(3,2,0) - #elif defined(_AIX3) - #define BOOST_OS_AIX BOOST_VERSION_NUMBER(3,0,0) - #else - #define BOOST_OS_AIX BOOST_VERSION_NUMBER(0,0,1) - #endif +# undef BOOST_OS_AIX +# if defined(_AIX43) +# define BOOST_OS_AIX BOOST_VERSION_NUMBER(4,3,0) +# elif defined(_AIX41) +# define BOOST_OS_AIX BOOST_VERSION_NUMBER(4,1,0) +# elif defined(_AIX32) +# define BOOST_OS_AIX BOOST_VERSION_NUMBER(3,2,0) +# elif defined(_AIX3) +# define BOOST_OS_AIX BOOST_VERSION_NUMBER(3,0,0) +# else +# define BOOST_OS_AIX BOOST_VERSION_NUMBER(0,0,1) +# endif #endif +#define BOOST_OS_AIX_NAME "IBM AIX" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_OS_AIX,"IBM AIX") +BOOST_PREDEF_DECLARE_TEST(BOOST_OS_AIX,BOOST_OS_AIX_NAME) + #endif diff --git a/boost/predef/os/amigaos.h b/boost/predef/os/amigaos.h index fcea99c..d1a73cc 100644 --- a/boost/predef/os/amigaos.h +++ b/boost/predef/os/amigaos.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -15,16 +15,27 @@ http://www.boost.org/LICENSE_1_0.txt) [heading `BOOST_OS_AMIGAOS`] [@http://en.wikipedia.org/wiki/AmigaOS AmigaOS] operating system. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ #define BOOST_OS_AMIGAOS BOOST_VERSION_NUMBER(0,0,0) #if defined(AMIGA) || defined(__amigaos__) - #undef BOOST_OS_AMIGAOS - #define BOOST_OS_AMIGAOS BOOST_VERSION_NUMBER(0,0,1) +# undef BOOST_OS_AMIGAOS +# define BOOST_OS_AMIGAOS BOOST_VERSION_NUMBER(0,0,1) #endif +#define BOOST_OS_AMIGAOS_NAME "AmigaOS" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_OS_AMIGAOS,"AmigaOS") +BOOST_PREDEF_DECLARE_TEST(BOOST_OS_AMIGAOS,BOOST_OS_AMIGAOS_NAME) + #endif diff --git a/boost/predef/os/beos.h b/boost/predef/os/beos.h index 888865b..98c02e4 100644 --- a/boost/predef/os/beos.h +++ b/boost/predef/os/beos.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -15,16 +15,27 @@ http://www.boost.org/LICENSE_1_0.txt) [heading `BOOST_OS_BEOS`] [@http://en.wikipedia.org/wiki/BeOS BeOS] operating system. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ #define BOOST_OS_BEOS BOOST_VERSION_NUMBER(0,0,0) #if defined(__BEOS__) - #undef BOOST_OS_BEOS - #define BOOST_OS_BEOS BOOST_VERSION_NUMBER(0,0,1) +# undef BOOST_OS_BEOS +# define BOOST_OS_BEOS BOOST_VERSION_NUMBER(0,0,1) #endif +#define BOOST_OS_BEOS_NAME "BeOS" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_OS_BEOS,"BeOS") +BOOST_PREDEF_DECLARE_TEST(BOOST_OS_BEOS,BOOST_OS_BEOS_NAME) + #endif diff --git a/boost/predef/os/bsd.h b/boost/predef/os/bsd.h index d3a760c..6060de9 100644 --- a/boost/predef/os/bsd.h +++ b/boost/predef/os/bsd.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -20,139 +20,52 @@ BSD has various branch operating systems possible and each detected individually. This detects the following variations and sets a specific version number macro to match: -* `BOOST_OS_DRAGONFLY_BSD` [@http://en.wikipedia.org/wiki/DragonFly_BSD DragonFly BSD] -* `BOOST_OS_FREE_BSD` [@http://en.wikipedia.org/wiki/Freebsd FreeBSD] -* `BOOST_OS_BSDI_BSD` [@http://en.wikipedia.org/wiki/BSD/OS BSDi BSD/OS] -* `BOOST_OS_NET_BSD` [@http://en.wikipedia.org/wiki/Netbsd NetBSD] -* `BOOST_OS_OPEN_BSD` [@http://en.wikipedia.org/wiki/Openbsd OpenBSD] +* `BOOST_OS_BSD_DRAGONFLY` [@http://en.wikipedia.org/wiki/DragonFly_BSD DragonFly BSD] +* `BOOST_OS_BSD_FREE` [@http://en.wikipedia.org/wiki/Freebsd FreeBSD] +* `BOOST_OS_BSD_BSDI` [@http://en.wikipedia.org/wiki/BSD/OS BSDi BSD/OS] +* `BOOST_OS_BSD_NET` [@http://en.wikipedia.org/wiki/Netbsd NetBSD] +* `BOOST_OS_BSD_OPEN` [@http://en.wikipedia.org/wiki/Openbsd OpenBSD] [note The general `BOOST_OS_BSD` is set in all cases to indicate some form of BSD. If the above variants is detected the corresponding macro is also set.] + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ #define BOOST_OS_BSD BOOST_VERSION_NUMBER(0,0,0) -#define BOOST_OS_DRAGONFLY_BSD BOOST_VERSION_NUMBER(0,0,0) -#define BOOST_OS_FREE_BSD BOOST_VERSION_NUMBER(0,0,0) -#define BOOST_OS_BSDI_BSD BOOST_VERSION_NUMBER(0,0,0) -#define BOOST_OS_NET_BSD BOOST_VERSION_NUMBER(0,0,0) -#define BOOST_OS_OPEN_BSD BOOST_VERSION_NUMBER(0,0,0) -#if defined(BSD) || defined(__bsdi__) || \ - defined(__DragonFly__) || defined(__FreeBSD__) || \ - defined(__NetBSD__) || defined(__OpenBSD__) || \ +#if defined(BSD) || \ defined(_SYSTYPE_BSD) - #undef BOOST_OS_BSD - #undef BOOST_OS_BSDI_BSD - #undef BOOST_OS_DRAGONFLY_BSD - #undef BOOST_OS_FREE_BSD - #undef BOOST_OS_NET_BSD - #undef BOOST_OS_OPEN_BSD - #include - #if defined(BSD4_2) - #define BOOST_OS_BSD BOOST_VERSION_NUMBER(4,2,0) - #elif defined(BSD4_3) - #define BOOST_OS_BSD BOOST_VERSION_NUMBER(4,3,0) - #elif defined(BSD4_4) - #define BOOST_OS_BSD BOOST_VERSION_NUMBER(4,4,0) - #elif defined(BSD) - #define BOOST_OS_BSD BOOST_PREDEF_MAKE_NN_NN(BSD) - #else - #define BOOST_OS_BSD BOOST_VERSION_NUMBER(0,0,1) - #endif - #if defined(__bsdi__) - #define BOOST_OS_BSDI_BSD BOOST_VERSION_NUMBER(0,0,1) - #endif - #if defined(__DragonFly__) - #define BOOST_OS_DRAGONFLY_BSD BOOST_VERSION_NUMBER(0,0,1) - #endif - #if defined(__FreeBSD__) - #if defined(__FreeBSD_version) - #if __FreeBSD_version < 500000 - #define BOOST_OS_FREE_BSD \ - BOOST_PREDEF_MAKE_N_N_N_000(__FreeBSD_version) - #else - #define BOOST_OS_FREE_BSD \ - BOOST_PREDEF_MAKE_N_NN_000(__FreeBSD_version) - #endif - #else - #define BOOST_OS_FREE_BSD BOOST_VERSION_NUMBER(0,0,1) - #endif - #endif - #if defined(__NetBSD__) - #if defined(NetBSD0_8) - #define BOOST_OS_NET_BSD BOOST_VERSION_NUMBER(0,8,0) - #elif defined(NetBSD0_9) - #define BOOST_OS_NET_BSD BOOST_VERSION_NUMBER(0,9,0) - #elif defined(NetBSD1_0) - #define BOOST_OS_NET_BSD BOOST_VERSION_NUMBER(1,0,0) - #elif defined(__NetBSD_Version) - #define BOOST_OS_NET_BSD \ - BOOST_PREDEF_MAKE_NN_NN_00_NN_00(__NetBSD_Version) - #else - #define BOOST_OS_NET_BSD BOOST_VERSION_NUMBER(0,0,1) - #endif - #endif - #if defined(__OpenBSD__) - #if defined(OpenBSD2_0) - #define BOOST_OS_OPEN_BSD BOOST_VERSION_NUMBER(2,0,0) - #elif defined(OpenBSD2_1) - #define BOOST_OS_OPEN_BSD BOOST_VERSION_NUMBER(2,1,0) - #elif defined(OpenBSD2_2) - #define BOOST_OS_OPEN_BSD BOOST_VERSION_NUMBER(2,2,0) - #elif defined(OpenBSD2_3) - #define BOOST_OS_OPEN_BSD BOOST_VERSION_NUMBER(2,3,0) - #elif defined(OpenBSD2_4) - #define BOOST_OS_OPEN_BSD BOOST_VERSION_NUMBER(2,4,0) - #elif defined(OpenBSD2_5) - #define BOOST_OS_OPEN_BSD BOOST_VERSION_NUMBER(2,5,0) - #elif defined(OpenBSD2_6) - #define BOOST_OS_OPEN_BSD BOOST_VERSION_NUMBER(2,6,0) - #elif defined(OpenBSD2_7) - #define BOOST_OS_OPEN_BSD BOOST_VERSION_NUMBER(2,7,0) - #elif defined(OpenBSD2_8) - #define BOOST_OS_OPEN_BSD BOOST_VERSION_NUMBER(2,8,0) - #elif defined(OpenBSD2_9) - #define BOOST_OS_OPEN_BSD BOOST_VERSION_NUMBER(2,9,0) - #elif defined(OpenBSD3_0) - #define BOOST_OS_OPEN_BSD BOOST_VERSION_NUMBER(3,0,0) - #elif defined(OpenBSD3_1) - #define BOOST_OS_OPEN_BSD BOOST_VERSION_NUMBER(3,1,0) - #elif defined(OpenBSD3_2) - #define BOOST_OS_OPEN_BSD BOOST_VERSION_NUMBER(3,2,0) - #elif defined(OpenBSD3_3) - #define BOOST_OS_OPEN_BSD BOOST_VERSION_NUMBER(3,3,0) - #elif defined(OpenBSD3_4) - #define BOOST_OS_OPEN_BSD BOOST_VERSION_NUMBER(3,4,0) - #elif defined(OpenBSD3_5) - #define BOOST_OS_OPEN_BSD BOOST_VERSION_NUMBER(3,5,0) - #elif defined(OpenBSD3_6) - #define BOOST_OS_OPEN_BSD BOOST_VERSION_NUMBER(3,6,0) - #elif defined(OpenBSD3_7) - #define BOOST_OS_OPEN_BSD BOOST_VERSION_NUMBER(3,7,0) - #elif defined(OpenBSD3_8) - #define BOOST_OS_OPEN_BSD BOOST_VERSION_NUMBER(3,8,0) - #elif defined(OpenBSD3_9) - #define BOOST_OS_OPEN_BSD BOOST_VERSION_NUMBER(3,9,0) - #elif defined(OpenBSD4_0) - #define BOOST_OS_OPEN_BSD BOOST_VERSION_NUMBER(4,0,0) - #elif defined(OpenBSD4_1) - #define BOOST_OS_OPEN_BSD BOOST_VERSION_NUMBER(4,1,0) - #elif defined(OpenBSD4_2) - #define BOOST_OS_OPEN_BSD BOOST_VERSION_NUMBER(4,2,0) - #elif defined(OpenBSD4_3) - #define BOOST_OS_OPEN_BSD BOOST_VERSION_NUMBER(4,3,0) - #else - #define BOOST_OS_OPEN_BSD BOOST_VERSION_NUMBER(0,0,1) - #endif - #endif +# undef BOOST_OS_BSD +# include +# if defined(BSD4_2) +# define BOOST_OS_BSD BOOST_VERSION_NUMBER(4,2,0) +# elif defined(BSD4_3) +# define BOOST_OS_BSD BOOST_VERSION_NUMBER(4,3,0) +# elif defined(BSD4_4) +# define BOOST_OS_BSD BOOST_VERSION_NUMBER(4,4,0) +# elif defined(BSD) +# define BOOST_OS_BSD BOOST_PREDEF_MAKE_10_VVRR(BSD) +# else +# define BOOST_OS_BSD BOOST_VERSION_NUMBER(0,0,1) +# endif #endif +#define BOOST_OS_BSD_NAME "BSD" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_OS_BSD,"BSD") -BOOST_PREDEF_DECLARE_TEST(BOOST_OS_DRAGONFLY_BSD,"DragonFly BSD") -BOOST_PREDEF_DECLARE_TEST(BOOST_OS_FREE_BSD,"Free BSD") -BOOST_PREDEF_DECLARE_TEST(BOOST_OS_BSDI_BSD,"BSDi BSD/OS") -BOOST_PREDEF_DECLARE_TEST(BOOST_OS_NET_BSD,"NetBSD") -BOOST_PREDEF_DECLARE_TEST(BOOST_OS_OPEN_BSD,"OpenBSD") +BOOST_PREDEF_DECLARE_TEST(BOOST_OS_BSD,BOOST_OS_BSD_NAME) + +#include +#include +#include +#include +#include #endif diff --git a/boost/predef/os/bsd/bsdi.h b/boost/predef/os/bsd/bsdi.h new file mode 100644 index 0000000..2f0343f --- /dev/null +++ b/boost/predef/os/bsd/bsdi.h @@ -0,0 +1,37 @@ +/* +Copyright Redshift Software, Inc. 2012 +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_OS_BSD_BSDI_H +#define BOOST_PREDEF_OS_BSD_BSDI_H + +/*` + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] + */ + +#define BOOST_OS_BSD_BSDI BOOST_VERSION_NUMBER(0,0,0) + +#if defined(__bsdi__) +# ifndef BOOST_OS_BSD +# define BOOST_OS_BSD BOOST_VERSION_NUMBER(0,0,1) +# endif +# undef BOOST_OS_BSD_BSDI +# define BOOST_OS_BSD_BSDI BOOST_VERSION_NUMBER(0,0,1) +#endif + +#define BOOST_OS_BSD_BSDI_NAME "BSDi BSD/OS" + +#include +BOOST_PREDEF_DECLARE_TEST(BOOST_OS_BSD_BSDI,BOOST_OS_BSD_BSDI_NAME) + +#endif diff --git a/boost/predef/os/bsd/dragonfly.h b/boost/predef/os/bsd/dragonfly.h new file mode 100644 index 0000000..fe7ecd0 --- /dev/null +++ b/boost/predef/os/bsd/dragonfly.h @@ -0,0 +1,39 @@ +/* +Copyright Redshift Software, Inc. 2012 +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_OS_BSD_DRAGONFLY_H +#define BOOST_PREDEF_OS_BSD_DRAGONFLY_H + +/*` + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] + */ + +#define BOOST_OS_BSD_DRAGONFLY BOOST_VERSION_NUMBER(0,0,0) + +#if defined(__DragonFly__) +# ifndef BOOST_OS_BSD +# define BOOST_OS_BSD BOOST_VERSION_NUMBER(0,0,1) +# endif +# undef BOOST_OS_BSD_DRAGONFLY +# if defined(__DragonFly__) +# define BOOST_OS_DRAGONFLY_BSD BOOST_VERSION_NUMBER(0,0,1) +# endif +#endif + +#define BOOST_OS_BSD_DRAGONFLY_NAME "DragonFly BSD" + +#include +BOOST_PREDEF_DECLARE_TEST(BOOST_OS_BSD_DRAGONFLY,BOOST_OS_BSD_DRAGONFLY_NAME) + +#endif diff --git a/boost/predef/os/bsd/free.h b/boost/predef/os/bsd/free.h new file mode 100644 index 0000000..d9b4d77 --- /dev/null +++ b/boost/predef/os/bsd/free.h @@ -0,0 +1,47 @@ +/* +Copyright Redshift Software, Inc. 2012 +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_OS_BSD_FREE_H +#define BOOST_PREDEF_OS_BSD_FREE_H + +/*` + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] + */ + +#define BOOST_OS_BSD_FREE BOOST_VERSION_NUMBER(0,0,0) + +#if defined(__FreeBSD__) +# ifndef BOOST_OS_BSD +# define BOOST_OS_BSD BOOST_VERSION_NUMBER(0,0,1) +# endif +# undef BOOST_OS_BSD_FREE +# if defined(__FreeBSD_version) +# if __FreeBSD_version < 500000 +# define BOOST_OS_BSD_FREE \ + BOOST_PREDEF_MAKE_10_VRP000(__FreeBSD_version) +# else +# define BOOST_OS_BSD_FREE \ + BOOST_PREDEF_MAKE_10_VRR000(__FreeBSD_version) +# endif +# else +# define BOOST_OS_BSD_FREE BOOST_VERSION_NUMBER(0,0,1) +# endif +#endif + +#define BOOST_OS_BSD_FREE_NAME "Free BSD" + +#include +BOOST_PREDEF_DECLARE_TEST(BOOST_OS_BSD_FREE,BOOST_OS_BSD_FREE_NAME) + +#endif diff --git a/boost/predef/os/bsd/net.h b/boost/predef/os/bsd/net.h new file mode 100644 index 0000000..18e6996 --- /dev/null +++ b/boost/predef/os/bsd/net.h @@ -0,0 +1,62 @@ +/* +Copyright Redshift Software, Inc. 2012 +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_OS_BSD_NET_H +#define BOOST_PREDEF_OS_BSD_NET_H + +/*` + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] + */ + +#define BOOST_OS_BSD_NET BOOST_VERSION_NUMBER(0,0,0) + +#if defined(__NETBSD__) || defined(__NetBSD__) +# ifndef BOOST_OS_BSD +# define BOOST_OS_BSD BOOST_VERSION_NUMBER(0,0,1) +# endif +# undef BOOST_OS_BSD_NET +# if defined(__NETBSD__) +# if defined(__NETBSD_version) +# if __NETBSD_version < 500000 +# define BOOST_OS_BSD_NET \ + BOOST_PREDEF_MAKE_10_VRP000(__NETBSD_version) +# else +# define BOOST_OS_BSD_NET \ + BOOST_PREDEF_MAKE_10_VRR000(__NETBSD_version) +# endif +# else +# define BOOST_OS_BSD_NET BOOST_VERSION_NUMBER(0,0,1) +# endif +# elif defined(__NetBSD__) +# if defined(NetBSD0_8) +# define BOOST_OS_BSD_NET BOOST_VERSION_NUMBER(0,8,0) +# elif defined(NetBSD0_9) +# define BOOST_OS_BSD_NET BOOST_VERSION_NUMBER(0,9,0) +# elif defined(NetBSD1_0) +# define BOOST_OS_BSD_NET BOOST_VERSION_NUMBER(1,0,0) +# elif defined(__NetBSD_Version) +# define BOOST_OS_BSD_NET \ + BOOST_PREDEF_MAKE_10_VVRR00PP00(__NetBSD_Version) +# else +# define BOOST_OS_BSD_NET BOOST_VERSION_NUMBER(0,0,1) +# endif +# endif +#endif + +#define BOOST_OS_BSD_NET_NAME "DragonFly BSD" + +#include +BOOST_PREDEF_DECLARE_TEST(BOOST_OS_BSD_NET,BOOST_OS_BSD_NET_NAME) + +#endif diff --git a/boost/predef/os/bsd/open.h b/boost/predef/os/bsd/open.h new file mode 100644 index 0000000..62cec80 --- /dev/null +++ b/boost/predef/os/bsd/open.h @@ -0,0 +1,87 @@ +/* +Copyright Redshift Software, Inc. 2012 +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_OS_BSD_OPEN_H +#define BOOST_PREDEF_OS_BSD_OPEN_H + +/*` + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] + */ + +#define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(0,0,0) + +#if defined(__OpenBSD__) +# ifndef BOOST_OS_BSD +# define BOOST_OS_BSD BOOST_VERSION_NUMBER(0,0,1) +# endif +# undef BOOST_OS_BSD_OPEN +# if defined(OpenBSD2_0) +# define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(2,0,0) +# elif defined(OpenBSD2_1) +# define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(2,1,0) +# elif defined(OpenBSD2_2) +# define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(2,2,0) +# elif defined(OpenBSD2_3) +# define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(2,3,0) +# elif defined(OpenBSD2_4) +# define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(2,4,0) +# elif defined(OpenBSD2_5) +# define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(2,5,0) +# elif defined(OpenBSD2_6) +# define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(2,6,0) +# elif defined(OpenBSD2_7) +# define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(2,7,0) +# elif defined(OpenBSD2_8) +# define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(2,8,0) +# elif defined(OpenBSD2_9) +# define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(2,9,0) +# elif defined(OpenBSD3_0) +# define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(3,0,0) +# elif defined(OpenBSD3_1) +# define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(3,1,0) +# elif defined(OpenBSD3_2) +# define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(3,2,0) +# elif defined(OpenBSD3_3) +# define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(3,3,0) +# elif defined(OpenBSD3_4) +# define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(3,4,0) +# elif defined(OpenBSD3_5) +# define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(3,5,0) +# elif defined(OpenBSD3_6) +# define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(3,6,0) +# elif defined(OpenBSD3_7) +# define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(3,7,0) +# elif defined(OpenBSD3_8) +# define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(3,8,0) +# elif defined(OpenBSD3_9) +# define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(3,9,0) +# elif defined(OpenBSD4_0) +# define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(4,0,0) +# elif defined(OpenBSD4_1) +# define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(4,1,0) +# elif defined(OpenBSD4_2) +# define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(4,2,0) +# elif defined(OpenBSD4_3) +# define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(4,3,0) +# else +# define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(0,0,1) +# endif +#endif + +#define BOOST_OS_BSD_OPEN_NAME "OpenBSD" + +#include +BOOST_PREDEF_DECLARE_TEST(BOOST_OS_BSD_OPEN,BOOST_OS_BSD_OPEN_NAME) + +#endif diff --git a/boost/predef/os/cygwin.h b/boost/predef/os/cygwin.h index ddaf202..769fdc4 100644 --- a/boost/predef/os/cygwin.h +++ b/boost/predef/os/cygwin.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2010 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -15,16 +15,27 @@ http://www.boost.org/LICENSE_1_0.txt) [heading `BOOST_OS_CYGWIN`] [@http://en.wikipedia.org/wiki/Cygwin Cygwin] evironment. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ #define BOOST_OS_CYGWIN BOOST_VERSION_NUMBER(0,0,0) #if defined(__CYGWIN__) - #undef BOOST_OS_CYGWIN - #define BOOST_OS_CGYWIN BOOST_VERSION_NUMBER(0,0,1) +# undef BOOST_OS_CYGWIN +# define BOOST_OS_CGYWIN BOOST_VERSION_NUMBER(0,0,1) #endif +#define BOOST_OS_CYGWIN_NAME "Cygwin" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_OS_CYGWIN,"Cygwin") +BOOST_PREDEF_DECLARE_TEST(BOOST_OS_CYGWIN,BOOST_OS_CYGWIN_NAME) + #endif diff --git a/boost/predef/os/hpux.h b/boost/predef/os/hpux.h index 59a57ad..e4a750a 100644 --- a/boost/predef/os/hpux.h +++ b/boost/predef/os/hpux.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2010 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -15,16 +15,27 @@ http://www.boost.org/LICENSE_1_0.txt) [heading `BOOST_OS_HPUX`] [@http://en.wikipedia.org/wiki/HP-UX HP-UX] operating system. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ #define BOOST_OS_HPUX BOOST_VERSION_NUMBER(0,0,0) #if defined(hpux) || defined(_hpux) || defined(__hpux) - #undef BOOST_OS_HPUX - #define BOOST_OS_HPUX BOOST_VERSION_NUMBER(0,0,1) +# undef BOOST_OS_HPUX +# define BOOST_OS_HPUX BOOST_VERSION_NUMBER(0,0,1) #endif +#define BOOST_OS_HPUX_NAME "HP-UX" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_OS_HPUX,"HP-UX") +BOOST_PREDEF_DECLARE_TEST(BOOST_OS_HPUX,BOOST_OS_HPUX_NAME) + #endif diff --git a/boost/predef/os/irix.h b/boost/predef/os/irix.h index 192c0e8..65255f4 100644 --- a/boost/predef/os/irix.h +++ b/boost/predef/os/irix.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2010 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -15,16 +15,27 @@ http://www.boost.org/LICENSE_1_0.txt) [heading `BOOST_OS_IRIX`] [@http://en.wikipedia.org/wiki/Irix IRIX] operating system. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ #define BOOST_OS_IRIX BOOST_VERSION_NUMBER(0,0,0) #if defined(sgi) || defined(__sgi) - #undef BOOST_OS_IRIX - #define BOOST_OS_IRIX BOOST_VERSION_NUMBER(0,0,1) +# undef BOOST_OS_IRIX +# define BOOST_OS_IRIX BOOST_VERSION_NUMBER(0,0,1) #endif +#define BOOST_OS_IRIX_NAME "IRIX" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_OS_IRIX,"IRIX") +BOOST_PREDEF_DECLARE_TEST(BOOST_OS_IRIX,BOOST_OS_IRIX_NAME) + #endif diff --git a/boost/predef/os/linux.h b/boost/predef/os/linux.h index 4375ada..c00e70a 100644 --- a/boost/predef/os/linux.h +++ b/boost/predef/os/linux.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2010 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -15,16 +15,27 @@ http://www.boost.org/LICENSE_1_0.txt) [heading `BOOST_OS_LINUX`] [@http://en.wikipedia.org/wiki/Linux Linux] operating system. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ #define BOOST_OS_LINUX BOOST_VERSION_NUMBER(0,0,0) #if defined(linux) || defined(__linux) - #undef BOOST_OS_LINUX - #define BOOST_OS_LINUX BOOST_VERSION_NUMBER(0,0,1) +# undef BOOST_OS_LINUX +# define BOOST_OS_LINUX BOOST_VERSION_NUMBER(0,0,1) #endif +#define BOOST_OS_LINUX_NAME "Linux" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_OS_LINUX,"Linux") +BOOST_PREDEF_DECLARE_TEST(BOOST_OS_LINUX,BOOST_OS_LINUX_NAME) + #endif diff --git a/boost/predef/os/macos.h b/boost/predef/os/macos.h index f2a47bf..8238ded 100644 --- a/boost/predef/os/macos.h +++ b/boost/predef/os/macos.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2010 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -16,21 +16,33 @@ http://www.boost.org/LICENSE_1_0.txt) [@http://en.wikipedia.org/wiki/Mac_OS Mac OS] operating system. Versions \[9-10\] are specifically detected. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ #define BOOST_OS_MACOS BOOST_VERSION_NUMBER(0,0,0) #if defined(macintosh) || defined(Macintosh) || \ (defined(__APPLE__) && defined(__MACH__)) - #undef BOOST_OS_MACOS - #if defined(__APPLE__) && defined(__MACH__) - #define BOOST_OS_MACOS BOOST_VERSION_NUMBER(10,0,0) - #else - #define BOOST_OS_MACOS BOOST_VERSION_NUMBER(9,0,0) - #endif +# undef BOOST_OS_MACOS +# if !defined(BOOST_OS_MACOS) && defined(__APPLE__) && defined(__MACH__) +# define BOOST_OS_MACOS BOOST_VERSION_NUMBER(10,0,0) +# endif +# if !defined(BOOST_OS_MACOS) +# define BOOST_OS_MACOS BOOST_VERSION_NUMBER(9,0,0) +# endif #endif +#define BOOST_OS_MACOS_NAME "Mac OS" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_OS_MACOS,"Mac OS") +BOOST_PREDEF_DECLARE_TEST(BOOST_OS_MACOS,BOOST_OS_MACOS_NAME) + #endif diff --git a/boost/predef/os/os400.h b/boost/predef/os/os400.h index ace0df4..441ebd7 100644 --- a/boost/predef/os/os400.h +++ b/boost/predef/os/os400.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software Inc 2011 +Copyright Redshift Software Inc 2011-2012 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) @@ -15,16 +15,27 @@ http://www.boost.org/LICENSE_1_0.txt) [heading `BOOST_OS_OS400`] [@http://en.wikipedia.org/wiki/IBM_i IBM OS/400] operating system. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ #define BOOST_OS_OS400 BOOST_VERSION_NUMBER(0,0,0) #if defined(__OS400__) - #undef BOOST_OS_OS400 - #define BOOST_OS_OS400 BOOST_VERSION_NUMBER(0,0,1) +# undef BOOST_OS_OS400 +# define BOOST_OS_OS400 BOOST_VERSION_NUMBER(0,0,1) #endif +#define BOOST_OS_OS400_NAME "IBM OS/400" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_OS_OS400,"IBM OS/400") +BOOST_PREDEF_DECLARE_TEST(BOOST_OS_OS400,BOOST_OS_OS400_NAME) + #endif diff --git a/boost/predef/os/qnxnto.h b/boost/predef/os/qnxnto.h index 554b83e..746db58 100644 --- a/boost/predef/os/qnxnto.h +++ b/boost/predef/os/qnxnto.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2010 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -17,22 +17,33 @@ http://www.boost.org/LICENSE_1_0.txt) [@http://en.wikipedia.org/wiki/QNX QNX] operating system. Version number available as major, and minor if possible. And version 4 is specifically detected. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ #define BOOST_OS_QNX BOOST_VERSION_NUMBER(0,0,0) #if defined(__QNX__) || defined(__QNXNTO__) - #undef BOOST_OS_QNX - #if defined(_NTO_VERSION) - #define BOOST_OS_QNX BOOST_PREDEF_MAKE_NN_NN(_NTO_VERSION) - #elif defined(__QNX__) - #define BOOST_OS_QNX BOOST_VERSION_NUMBER(4,0,0) - #else - #define BOOST_OS_QNX BOOST_VERSION_NUMBER(0,0,1) - #endif +# undef BOOST_OS_QNX +# if defined(_NTO_VERSION) +# define BOOST_OS_QNX BOOST_PREDEF_MAKE_10_VVRR(_NTO_VERSION) +# elif defined(__QNX__) +# define BOOST_OS_QNX BOOST_VERSION_NUMBER(4,0,0) +# else +# define BOOST_OS_QNX BOOST_VERSION_NUMBER(0,0,1) +# endif #endif +#define BOOST_OS_QNX_NAME "QNX" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_OS_QNX,"QNX") +BOOST_PREDEF_DECLARE_TEST(BOOST_OS_QNX,BOOST_OS_QNX_NAME) + #endif diff --git a/boost/predef/os/solaris.h b/boost/predef/os/solaris.h index c574da7..49b0463 100644 --- a/boost/predef/os/solaris.h +++ b/boost/predef/os/solaris.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2010 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -15,16 +15,27 @@ http://www.boost.org/LICENSE_1_0.txt) [heading `BOOST_OS_SOLARIS`] [@http://en.wikipedia.org/wiki/Solaris_Operating_Environment Solaris] operating system. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ #define BOOST_OS_SOLARIS BOOST_VERSION_NUMBER(0,0,0) #if defined(sun) || defined(__sun) - #undef BOOST_OS_SOLARIS - #define BOOST_OS_SOLARIS BOOST_VERSION_NUMBER(0,0,1) +# undef BOOST_OS_SOLARIS +# define BOOST_OS_SOLARIS BOOST_VERSION_NUMBER(0,0,1) #endif +#define BOOST_OS_SOLARIS_NAME "Solaris" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_OS_SOLARIS,"Solaris") +BOOST_PREDEF_DECLARE_TEST(BOOST_OS_SOLARIS,BOOST_OS_SOLARIS_NAME) + #endif diff --git a/boost/predef/os/unix.h b/boost/predef/os/unix.h index 09d5693..459babf 100644 --- a/boost/predef/os/unix.h +++ b/boost/predef/os/unix.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2010 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -15,14 +15,22 @@ http://www.boost.org/LICENSE_1_0.txt) [heading `BOOST_OS_UNIX`] [@http://en.wikipedia.org/wiki/Unix Unix Environment] operating system. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ #define BOOST_OS_UNIX BOOST_VERSION_NUMBER(0,0,0) #if defined(unix) || defined(__unix) || \ defined(_XOPEN_SOURCE) || defined(_POSIX_SOURCE) - #undef BOOST_OS_UNIX - #define BOOST_OS_UNIX BOOST_VERSION_NUMBER(0,0,1) +# undef BOOST_OS_UNIX +# define BOOST_OS_UNIX BOOST_VERSION_NUMBER(0,0,1) #endif /*` @@ -35,12 +43,15 @@ http://www.boost.org/LICENSE_1_0.txt) #if defined(__sysv__) || defined(__SVR4) || \ defined(__svr4__) || defined(_SYSTYPE_SVR4) - #undef BOOST_OS_SVR4 - #define BOOST_OS_SVR4 BOOST_VERSION_NUMBER(0,0,1) +# undef BOOST_OS_SVR4 +# define BOOST_OS_SVR4 BOOST_VERSION_NUMBER(0,0,1) #endif +#define BOOST_OS_UNIX_NAME "Unix ENvironment" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_OS_UNIX,"Unix ENvironment") +BOOST_PREDEF_DECLARE_TEST(BOOST_OS_UNIX,BOOST_OS_UNIX_NAME) + BOOST_PREDEF_DECLARE_TEST(BOOST_OS_SVR4,"SVR4 Environment") #endif diff --git a/boost/predef/os/vms.h b/boost/predef/os/vms.h index 986cb2b..86e434f 100644 --- a/boost/predef/os/vms.h +++ b/boost/predef/os/vms.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software Inc 2011 +Copyright Redshift Software Inc 2011-2012 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) @@ -16,20 +16,31 @@ http://www.boost.org/LICENSE_1_0.txt) [@http://en.wikipedia.org/wiki/Vms VMS] operating system. Version number available as major, minor, and patch. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ #define BOOST_OS_VMS BOOST_VERSION_NUMBER(0,0,0) #if defined(VMS) || defined(__VMS) - #undef BOOST_OS_VMS - #if defined(__VMS_VER) - #define BOOST_OS_VMS BOOST_PREDEF_MAKE_NN_NN_00_NN_00(__VMS_VER) - #else - #define BOOST_OS_VMS BOOST_VERSION_NUMBER(0,0,1) - #endif +# undef BOOST_OS_VMS +# if defined(__VMS_VER) +# define BOOST_OS_VMS BOOST_PREDEF_MAKE_10_VVRR00PP00(__VMS_VER) +# else +# define BOOST_OS_VMS BOOST_VERSION_NUMBER(0,0,1) +# endif #endif +#define BOOST_OS_VMS_NAME "VMS" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_OS_VMS,"VMS") +BOOST_PREDEF_DECLARE_TEST(BOOST_OS_VMS,BOOST_OS_VMS_NAME) + #endif diff --git a/boost/predef/os/windows.h b/boost/predef/os/windows.h index 748c26c..dfc21ed 100644 --- a/boost/predef/os/windows.h +++ b/boost/predef/os/windows.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2010 +Copyright Redshift Software, Inc. 2008-2012 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) @@ -15,18 +15,29 @@ http://www.boost.org/LICENSE_1_0.txt) [heading `BOOST_OS_WINDOWS`] [@http://en.wikipedia.org/wiki/Category:Microsoft_Windows Microsoft Windows] operating system. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[``] [__predef_detection__]] + + [[``] [V.R.P]] + ] */ #define BOOST_OS_WINDOWS BOOST_VERSION_NUMBER(0,0,0) #if defined(_WIN32) || defined(_WIN64) || \ - defined(__WIN32__) || defined(__TOS_WIN__) || \ - defined(__WINDOWS__) - #undef BOOST_OS_WINDOWS - #define BOOST_OS_WINDOWS BOOST_VERSION_NUMBER(0,0,1) + defined(__WIN32__) || defined(__TOS_WIN__) || \ + defined(__WINDOWS__) +# undef BOOST_OS_WINDOWS +# define BOOST_OS_WINDOWS BOOST_VERSION_NUMBER(0,0,1) #endif +#define BOOST_OS_WINDOWS_NAME "Microsoft Windows" + #include -BOOST_PREDEF_DECLARE_TEST(BOOST_OS_WINDOWS,"Microsoft Windows") +BOOST_PREDEF_DECLARE_TEST(BOOST_OS_WINDOWS,BOOST_OS_WINDOWS_NAME) + #endif diff --git a/boost/predef/version_number.h b/boost/predef/version_number.h index ef4506c..67f7d8f 100644 --- a/boost/predef/version_number.h +++ b/boost/predef/version_number.h @@ -1,6 +1,6 @@ /* Copyright Rene Rivera 2005 -Copyright Redshift Software, Inc. 2008-2011 +Copyright Redshift Software, Inc. 2008-2012 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) diff --git a/libs/predef/doc/build.jam b/libs/predef/doc/build.jam index a8ec20a..f08a366 100644 --- a/libs/predef/doc/build.jam +++ b/libs/predef/doc/build.jam @@ -4,17 +4,21 @@ # http://www.boost.org/LICENSE_1_0.txt) using quickbook ; +import path ; if ! $(BOOST_ROOT) { BOOST_ROOT = [ modules.peek : BOOST_ROOT ] ; } +local BOOST_PREDEF_HEADERS = [ path.glob-tree $(BOOST_PREDEF_ROOT)/boost/predef : *.h ] ; + xml predef : predef.qbk : $(BOOST_PREDEF_ROOT)/boost/predef.h + $(BOOST_PREDEF_HEADERS) ; explicit predef ; diff --git a/libs/predef/doc/html/index.html b/libs/predef/doc/html/index.html index e28b05e..1ee6a83 100644 --- a/libs/predef/doc/html/index.html +++ b/libs/predef/doc/html/index.html @@ -37,11 +37,10 @@
Adding new predefs
Reference
-
BOOST_ARCHITECTURE_ architecture macros
-
BOOST_CXX_ compiler macros
-
BOOST_LANGUAGE_ language standards macros
-
BOOST_LIBC_ and BOOST_LIBSTD_ - library macros
+
BOOST_ARCH architecture macros
+
BOOST_COMP compiler macros
+
BOOST_LANG language standards macros
+
BOOST_LIB library macros
BOOST_OS_ operating system macros
Version definition macros
@@ -59,7 +58,7 @@ - +

Last revised: February 10, 2012 at 14:55:42 GMT

Last revised: July 13, 2012 at 13:52:32 GMT
diff --git a/libs/predef/doc/html/minimal.css b/libs/predef/doc/html/minimal.css index 401b73e..76d1031 100644 --- a/libs/predef/doc/html/minimal.css +++ b/libs/predef/doc/html/minimal.css @@ -7,16 +7,17 @@ */ -/******************************************************************************* - Body -*******************************************************************************/ +body { + font-family: sans-serif; + margin: 1em; + max-width : 8.5in; + } -body { font-family: sans-serif; margin: 1em; } +table { margin: 0.5em; } -/******************************************************************************* - Table -*******************************************************************************/ +pre { background-color:#D7EEFF } -table { margin: 0.5em; } +ins { background-color:#A0FFA0 } +del { background-color:#FFA0A0 } /*** end ***/ \ No newline at end of file diff --git a/libs/predef/doc/html/predef/reference.html b/libs/predef/doc/html/predef/reference.html index 9c6140c..6bd01cd 100644 --- a/libs/predef/doc/html/predef/reference.html +++ b/libs/predef/doc/html/predef/reference.html @@ -17,233 +17,314 @@ Reference
-
BOOST_ARCHITECTURE_ architecture macros
-
BOOST_CXX_ compiler macros
-
BOOST_LANGUAGE_ language standards macros
-
BOOST_LIBC_ and BOOST_LIBSTD_ - library macros
+
BOOST_ARCH architecture macros
+
BOOST_COMP compiler macros
+
BOOST_LANG language standards macros
+
BOOST_LIB library macros
BOOST_OS_ operating system macros
Version definition macros
-
+
- - BOOST_ARCHITECTURE_ALPHA + + BOOST_ARCH_ALPHA, DEC + Alpha
-

- DEC Alpha architecture: - If available versions [4-6] are specifically detected. -

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

+ Symbol +

+ 		+

+ Version +

+
+

+ __alpha__ +

+ 		+

+ detection +

+
+

+ __alpha +

+ 		+

+ detection +

+
+

+ _M_ALPHA +

+ 		+

+ detection +

+
+

+ __alpha_ev4__ +

+ 		+

+ 4.0.0 +

+
+

+ __alpha_ev5__ +

+ 		+

+ 5.0.0 +

+
+

+ __alpha_ev6__ +

+ 		+

+ 6.0.0 +

+
- - BOOST_ARCHITECTURE_AMD64 + + BOOST_ARCH_AMD64

- American Micro Devices AMD + Advanced Micro Devices AMD 64 architecture.

- - BOOST_ARCHITECTURE_ARM + + BOOST_ARCH_ARM

ARM architecture.

- - BOOST_ARCHITECTURE_CONVEX + + BOOST_ARCH_CONVEX

Convex Computer architecture.

- - BOOST_ARCHITECTURE_IA64 + + BOOST_ARCH_IA64

Intel IA-64 architecture.

- - BOOST_ARCHITECTURE_M68K + + BOOST_ARCH_M68K

Motorola 68k architecture.

- - BOOST_ARCHITECTURE_MIPS + + BOOST_ARCH_MIPS

MIPS architecture.

- - BOOST_ARCHITECTURE_PARISK + + BOOST_ARCH_PARISK

HP/PA RISC architecture.

- - BOOST_ARCHITECTURE_PPC + + BOOST_ARCH_PPC

PowerPC architecture.

- - BOOST_ARCHITECTURE_PYRAMID + + BOOST_ARCH_PYRAMID

Pyramid 9810 architecture.

- - BOOST_ARCHITECTURE_RS6000 + + BOOST_ARCH_RS6000

RS/6000 architecture.

- - BOOST_ARCHITECTURE_SPARC + + BOOST_ARCH_SPARC

SPARC architecture.

- - BOOST_ARCHITECTURE_SH + + BOOST_ARCH_SH

SuperH architecture: If available versions [1-5] are specifically detected.

- - BOOST_ARCHITECTURE_SYS370 + + BOOST_ARCH_SYS370

System/370 architecture.

- - BOOST_ARCHITECTURE_SYS390 + + BOOST_ARCH_SYS390

System/390 architecture.

- - BOOST_ARCHITECTURE_X86 + + BOOST_ARCH_X86

Intel x86 architecture: If available versions [3-6] are specifically detected.

- - BOOST_ARCHITECTURE_Z + + BOOST_ARCH_Z

z/Architecture architecture.

-
+
- - BOOST_CXX_BORLAND + + BOOST_COMP_BORLAND

Borland C++ compiler. Version number available as major, minor, and patch.

- - BOOST_CXX_CLANG + + BOOST_COMP_CLANG

Clang compiler. Version number available as major, minor, and patch.

- - BOOST_CXX_COMO + + BOOST_COMP_COMO

Comeau C++ compiler. Version number available as major, minor, and patch.

- - BOOST_CXX_DEC + + BOOST_COMP_DEC

Compaq C/C++ compiler. Version number available as major, minor, and patch.

- - BOOST_CXX_CYGWIN -
-

- Cygwin compiler. -

-
- - BOOST_CXX_DIAB + + BOOST_COMP_DIAB

Diab C/C++ compiler. Version number available as major, minor, and patch.

- - BOOST_CXX_DMC + + BOOST_COMP_DMC

Digital Mars compiler. Version number available as major, minor, and patch.

- - BOOST_CXX_SYSC + + BOOST_COMP_SYSC

Dignus Systems/C++ compiler. Version number available as major, minor, and patch.

- - BOOST_CXX_EDG + + BOOST_COMP_EDG

EDG C++ Frontend compiler. Version number available as major, minor, and patch.

- - BOOST_CXX_PATH + + BOOST_COMP_PATH

EKOpath compiler. Version number available as major, minor, and patch.

- - BOOST_CXX_GNUC + + BOOST_COMP_GNUC

Gnu GCC @@ -251,182 +332,182 @@ (if available).

- - BOOST_CXX_GCCXML + + BOOST_COMP_GCCXML

GCC XML compiler.

- - BOOST_CXX_GHS + + BOOST_COMP_GHS

Green Hills C/C++ compiler. Version number available as major, minor, and patch.

- - BOOST_CXX_HPACC + + BOOST_COMP_HPACC

HP aC++ compiler. Version number available as major, minor, and patch.

- - BOOST_CXX_IAR + + BOOST_COMP_IAR

IAR C/C++ compiler. Version number available as major, minor, and patch.

- - BOOST_CXX_IBM + + BOOST_COMP_IBM

IBM XL C/C++ compiler. Version number available as major, minor, and patch.

- - BOOST_CXX_INTEL + + BOOST_COMP_INTEL

Intel C/C++ compiler. Version number available as major, minor, and patch.

- - BOOST_CXX_KCC + + BOOST_COMP_KCC

Kai C++ compiler. Version number available as major, minor, and patch.

- - BOOST_CXX_LLVM + + BOOST_COMP_LLVM

LLVM compiler.

- - BOOST_CXX_HIGHC + + BOOST_COMP_HIGHC

MetaWare High C/C++ compiler.

- - BOOST_CXX_MWERKS + + BOOST_COMP_MWERKS

Metrowerks CodeWarrior compiler. Version number available as major, minor, and patch.

- - BOOST_CXX_MRI + + BOOST_COMP_MRI

Microtec C/C++ compiler.

- - BOOST_CXX_MINGW + + BOOST_COMP_MINGW

MinGW compiler. Version number available as major, minor, and patch.

- - BOOST_CXX_MPW + + BOOST_COMP_MPW

MPW C++ compiler. Version number available as major, and minor.

- - BOOST_CXX_PALM + + BOOST_COMP_PALM

Palm C/C++ compiler. Version number available as major, minor, and patch.

- - BOOST_CXX_PGI + + BOOST_COMP_PGI

Portland Group C/C++ compiler.

- - BOOST_CXX_SGI + + BOOST_COMP_SGI

SGI MIPSpro compiler. Version number available as major, minor, and patch.

- - BOOST_CXX_SUNPRO + + BOOST_COMP_SUNPRO

Sun Studio compiler. Version number available as major, minor, and patch.

- - BOOST_CXX_TENDRA + + BOOST_COMP_TENDRA

TenDRA C/C++ compiler.

- - BOOST_CXX_MSVC + + BOOST_COMP_MSVC

Microsoft Visual C/C++ compiler. Version number available as major, minor, and patch.

- - BOOST_CXX_WATCOM + + BOOST_COMP_WATCOM

Watcom C++ compiler. Version number available as major, and minor.

-
+
- - BOOST_LANGUAGE_OBJC + + BOOST_LANG_OBJC

Objective-C language.

- - BOOST_LANGUAGE_STDC + + BOOST_LANG_STDC

Standard C language. If available, the year of the standard is detected as - 0.0.YYYY. + YYYY.1.1 from the Epoc date.

- - BOOST_LANGUAGE_STDCPP + + BOOST_LANG_STDCPP

Standard C++ language. @@ -436,7 +517,7 @@ are:

-

Table 1. Detected Version Number vs. C++ Standard Year

+

Table 1. Detected Version Number vs. C++ Standard Year

@@ -533,134 +614,133 @@

- - BOOST_LANGUAGE_STDCPPCLI + + BOOST_LANG_STDCPPCLI

Standard C++/CLI language. If available, the year of the standard is detected as 0.0.YYYY.

- - BOOST_LANGUAGE_STDECPP + + BOOST_LANG_STDECPP

Standard Embedded C++ language.

-
+
- - BOOST_LIBC_GNU + + BOOST_LIB_C_GNU

GNU glibc Standard C library. Version number available as major, and minor.

- - BOOST_LIBC_UC + + BOOST_LIB_C_UC

uClibc Standard C library. Version number available as major, minor, and patch.

- - BOOST_LIBC_VMS + + BOOST_LIB_C_VMS

VMS libc Standard C library. Version number available as major, minor, and patch.

- - BOOST_LIBC_ZOS + + BOOST_LIB_C_ZOS

z/OS libc Standard C library. Version number available as major, minor, and patch.

- - BOOST_LIBSTD_CXX + + BOOST_LIB_STD_CXX

libc++ C++ Standard Library. If available version number as major, minor, and patch.

- - BOOST_LIBSTD_DINKUMWARE + + BOOST_LIB_STD_DINKUMWARE

Dinkumware Standard C++ Library. If available version number as major, minor, and patch.

- - BOOST_LIBSTD_COMO + + BOOST_LIB_STD_COMO

Comeau Computing Standard C++ Library. Version number available as major.

- - BOOST_LIBSTD_MSIPL + + BOOST_LIB_STD_MSIPL

Modena Software Lib++ Standard C++ Library.

- - BOOST_LIBSTD_MSL + + BOOST_LIB_STD_MSL

Metrowerks Standard C++ Library. Version number available as major, minor, and patch.

- - BOOST_LIBSTD_RW + + BOOST_LIB_STD_RW

Roguewave Standard C++ library. If available version number as major, minor, and patch.

- - BOOST_LIBSTD_SGI + + BOOST_LIB_STD_SGI

SGI Standard C++ library. If available version number as major, minor, and patch.

- - BOOST_LIBSTD_GNU + + BOOST_LIB_STD_GNU

GNU libstdc++ Standard C++ library. Version number available as year (from 1970), month, and day.

- - BOOST_LIBSTD_STLPORT + + BOOST_LIB_STD_STLPORT

STLport Standard C++ library. Version number available as major, minor, and patch.

- - BOOST_LIBSTD_IBM + + BOOST_LIB_STD_IBM

IBM VACPP Standard @@ -709,20 +789,20 @@

@@ -877,96 +957,101 @@
- BOOST_PREDEF_MAKE_F.. + BOOST_PREDEF_MAKE_.. macros

These set of macros decompose common vendor version number macros which are - composed of hexadecimal digits. The naming convention indicates what the - format of the vendor version number. Where "F" - indicates a hexadecimal digit, "_" - separates the major/minor/patch parts of the version number, and "0" indicates an ignored hexadecimal digit. + composed version, revision, and patch digits. The naming convention indicates: +

+
* The base of the specified version number. "`BOOST_PREDEF_MAKE_0X`" for
+  hexadecimal digits, and "`BOOST_PREDEF_MAKE_10`" for decimal digits.
+* The format of the vendor version number. Where "`V`" indicates the version digits,
+  "`R`" indicates the revision digits, "`P`" indicates the patch digits, and "`0`"
+  indicates an ignored digit.
+
+

Macros are:

- BOOST_PREDER_MAKE_F_F_F(V) + BOOST_PREDEF_MAKE_0X_VRP(V)

- BOOST_PREDEF_MAKE_FF_F_F(V) + BOOST_PREDEF_MAKE_0X_VVRP(V)

- BOOST_PREDEF_MAKE_F_F_FF(V) + BOOST_PREDEF_MAKE_0X_VRPP(V)

- BOOST_PREDEF_MAKE_FF_FF(V) + BOOST_PREDEF_MAKE_0X_VVRR(V)

- BOOST_PREDEF_MAKE_F_FF_FFFF(V) + BOOST_PREDEF_MAKE_0X_VRRPPPP(V)

- BOOST_PREDEF_MAKE_FF_FF_F(V) + BOOST_PREDEF_MAKE_0X_VVRRP(V)

- BOOST_PREDEF_MAKE_F_FF_FF_000(V) + BOOST_PREDEF_MAKE_0X_VRRPP000(V) +

+

+ BOOST_PREDEF_MAKE_10_VPPP(V) +

+

+ BOOST_PREDEF_MAKE_10_VRP(V) +

+

+ BOOST_PREDEF_MAKE_10_VRP000(V) +

+

+ BOOST_PREDEF_MAKE_10_VRPP(V) +

+

+ BOOST_PREDEF_MAKE_10_VRR(V) +

+

+ BOOST_PREDEF_MAKE_10_VRRPP(V) +

+

+ BOOST_PREDEF_MAKE_10_VRR000(V) +

+

+ BOOST_PREDEF_MAKE_10_VV00(V) +

+

+ BOOST_PREDEF_MAKE_10_VVRR(V) +

+

+ BOOST_PREDEF_MAKE_10_VVRRPP(V) +

+

+ BOOST_PREDEF_MAKE_10_VVRR0PP00(V) +

+

+ BOOST_PREDEF_MAKE_10_VVRR0PPPP(V) +

+

+ BOOST_PREDEF_MAKE_10_VVRR00PP00(V)

- BOOST_PREDEF_MAKE_N.. - macros + BOOST_PREDEF_MAKE_*.. + date macros

- These set of macros decompose common vendor version number macros which are - composed of decimal digits. The naming convention indicates what the format - of the vendor version number. Where "N" - indicates a decimal digit, "_" - separates the major/minor/patch parts of the version number, and "0" indicates an ignored decimal digit. - Macros are: + Date decomposition macros return a date in the relative to the 1970 Epoch + date. If the month is not available, January 1st is used as the month and + day. If the day is not available, but the month is, the 1st of the month + is used as the day.

- BOOST_PREDEF_MAKE_N__NNN(V) + BOOST_PREDEF_MAKE_DATE(Y,M,D)

- BOOST_PREDEF_MAKE_N_N_N(V) + BOOST_PREDEF_MAKE_YYYYMMDD(V)

- BOOST_PREDEF_MAKE_N_N_N_000(V) -

-

- BOOST_PREDEF_MAKE_N_N_NN(V) -

-

- BOOST_PREDEF_MAKE_N_NN(V) -

-

- BOOST_PREDEF_MAKE_N_NN_NN(V) -

-

- BOOST_PREDEF_MAKE_N_NN_000(V) -

-

- BOOST_PREDEF_MAKE_NN_00(V) -

-

- BOOST_PREDEF_MAKE_NN_NN(V) -

-

- BOOST_PREDEF_MAKE_NN_NN_NN(V) -

-

- BOOST_PREDEF_MAKE_NN_NN_0_NN_00(V) -

-

- BOOST_PREDEF_MAKE_NN_NN_0_NNNN(V) -

-

- BOOST_PREDEF_MAKE_NN_NN_00_NN_00(V) -

-

- BOOST_PREDEF_MAKE_YYYY_MM_DD(V) -

-

- The date decomposition returns a date in the form BOOST_VERSION_NUMBER(YYYY-1970,MM,DD). - I.e. a date relative to the 1970 Epoch date. + BOOST_PREDEF_MAKE_YYYY(V)

diff --git a/libs/predef/doc/predef.qbk b/libs/predef/doc/predef.qbk index 02894bf..06a98b0 100644 --- a/libs/predef/doc/predef.qbk +++ b/libs/predef/doc/predef.qbk @@ -385,21 +385,25 @@ and "Y", "M", "D" for dates. [endsect] +[def __predef_symbol__ Symbol] +[def __predef_version__ Version] +[def __predef_detection__ *detection*] + [section Reference] -[section `BOOST_ARCHITECTURE_` architecture macros] +[section `BOOST_ARCH` architecture macros] [include ../../../boost/predef/architecture/*.h] [endsect] -[section `BOOST_CXX_` compiler macros] +[section `BOOST_COMP` compiler macros] [include ../../../boost/predef/compiler/*.h] [endsect] -[section `BOOST_LANGUAGE_` language standards macros] +[section `BOOST_LANG` language standards macros] [include ../../../boost/predef/language/*.h] [endsect] -[section `BOOST_LIBC_` and `BOOST_LIBSTD_` library macros] +[section `BOOST_LIB` library macros] [include ../../../boost/predef/library/*/*.h] [endsect] diff --git a/libs/predef/test/info_as_c.c b/libs/predef/test/info_as_c.c index 5286f1e..15bc79f 100644 --- a/libs/predef/test/info_as_c.c +++ b/libs/predef/test/info_as_c.c @@ -1,5 +1,5 @@ /* -Copyright Redshift Software Inc. 2011 +Copyright Redshift Software Inc. 2011-2012 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) diff --git a/libs/predef/test/info_as_cpp.cpp b/libs/predef/test/info_as_cpp.cpp index ad05fd4..c63def2 100644 --- a/libs/predef/test/info_as_cpp.cpp +++ b/libs/predef/test/info_as_cpp.cpp @@ -1,5 +1,5 @@ /* -Copyright Redshift Software Inc. 2011 +Copyright Redshift Software Inc. 2011-2012 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) diff --git a/libs/predef/test/make.cpp b/libs/predef/test/make.cpp index bd4f514..37bb0ca 100644 --- a/libs/predef/test/make.cpp +++ b/libs/predef/test/make.cpp @@ -1,5 +1,5 @@ /* -Copyright Redshift Software Inc 2011 +Copyright Redshift Software Inc 2011-2012 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) @@ -29,31 +29,31 @@ namespace void test_BOOST_VERSION_NUMBER() { - PREDEF_CHECK(BOOST_PREDEF_MAKE_F_F_F(0xFFF) == BOOST_VERSION_NUMBER(0xF,0xF,0xF)); - PREDEF_CHECK(BOOST_PREDEF_MAKE_FF_F_F(0xFFFF) == BOOST_VERSION_NUMBER(0xFF,0xF,0xF)); - PREDEF_CHECK(BOOST_PREDEF_MAKE_F_F_FF(0xFFFF) == BOOST_VERSION_NUMBER(0xF,0xF,0xFF)); - PREDEF_CHECK(BOOST_PREDEF_MAKE_FF_FF(0xFFFF) == BOOST_VERSION_NUMBER(0xFF,0xFF,0x0)); - PREDEF_CHECK(BOOST_PREDEF_MAKE_F_FF_FFFF(0xFFFFFFF) == BOOST_VERSION_NUMBER(0xF,0xFF,0xFFFF)); - PREDEF_CHECK(BOOST_PREDEF_MAKE_FF_FF_F(0xFFFFF) == BOOST_VERSION_NUMBER(0xFF,0xFF,0xF)); - PREDEF_CHECK(BOOST_PREDEF_MAKE_F_FF_FF_000(0xFFFFF000) == BOOST_VERSION_NUMBER(0xF,0xFF,0xFF)); + PREDEF_CHECK(BOOST_PREDEF_MAKE_0X_VRP(0xFFF) == BOOST_VERSION_NUMBER(0xF,0xF,0xF)); + PREDEF_CHECK(BOOST_PREDEF_MAKE_0X_VVRP(0xFFFF) == BOOST_VERSION_NUMBER(0xFF,0xF,0xF)); + PREDEF_CHECK(BOOST_PREDEF_MAKE_0X_VRPP(0xFFFF) == BOOST_VERSION_NUMBER(0xF,0xF,0xFF)); + PREDEF_CHECK(BOOST_PREDEF_MAKE_0X_VVRR(0xFFFF) == BOOST_VERSION_NUMBER(0xFF,0xFF,0x0)); + PREDEF_CHECK(BOOST_PREDEF_MAKE_0X_VRRPPPP(0xFFFFFFF) == BOOST_VERSION_NUMBER(0xF,0xFF,0xFFFF)); + PREDEF_CHECK(BOOST_PREDEF_MAKE_0X_VVRRP(0xFFFFF) == BOOST_VERSION_NUMBER(0xFF,0xFF,0xF)); + PREDEF_CHECK(BOOST_PREDEF_MAKE_0X_VRRPP000(0xFFFFF000) == BOOST_VERSION_NUMBER(0xF,0xFF,0xFF)); - PREDEF_CHECK(BOOST_PREDEF_MAKE_N_N_N(999) == BOOST_VERSION_NUMBER(9,9,9)); - PREDEF_CHECK(BOOST_PREDEF_MAKE_N__NNN(9999) == BOOST_VERSION_NUMBER(9,0,999)); - PREDEF_CHECK(BOOST_PREDEF_MAKE_NN_NN_NN(999999) == BOOST_VERSION_NUMBER(99,99,99)); - PREDEF_CHECK(BOOST_PREDEF_MAKE_NN_NN(9999) == BOOST_VERSION_NUMBER(99,99,0)); - PREDEF_CHECK(BOOST_PREDEF_MAKE_N_N_NN(9999) == BOOST_VERSION_NUMBER(9,9,99)); - PREDEF_CHECK(BOOST_PREDEF_MAKE_N_NN_NN(99999) == BOOST_VERSION_NUMBER(9,99,99)); - PREDEF_CHECK(BOOST_PREDEF_MAKE_N_N_N_000(999000) == BOOST_VERSION_NUMBER(9,9,9)); - PREDEF_CHECK(BOOST_PREDEF_MAKE_N_NN_000(999000) == BOOST_VERSION_NUMBER(9,99,0)); - PREDEF_CHECK(BOOST_PREDEF_MAKE_NN_NN_00_NN_00(9999009900) == BOOST_VERSION_NUMBER(99,99,99)); - PREDEF_CHECK(BOOST_PREDEF_MAKE_NN_NN_0_NN_00(999909900) == BOOST_VERSION_NUMBER(99,99,99)); - PREDEF_CHECK(BOOST_PREDEF_MAKE_NN_00(9900) == BOOST_VERSION_NUMBER(99,00,00)); - PREDEF_CHECK(BOOST_PREDEF_MAKE_NN_NN_0_NNNN(999909999) == BOOST_VERSION_NUMBER(99,99,9999)); - PREDEF_CHECK(BOOST_PREDEF_MAKE_N_NN(999) == BOOST_VERSION_NUMBER(9,99,00)); + PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VRP(999) == BOOST_VERSION_NUMBER(9,9,9)); + PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VPPP(9999) == BOOST_VERSION_NUMBER(9,0,999)); + PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VVRRPP(999999) == BOOST_VERSION_NUMBER(99,99,99)); + PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VVRR(9999) == BOOST_VERSION_NUMBER(99,99,0)); + PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VRPP(9999) == BOOST_VERSION_NUMBER(9,9,99)); + 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(9999009900) == 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)); + PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VRR(999) == BOOST_VERSION_NUMBER(9,99,00)); - PREDEF_CHECK(BOOST_PREDEF_MAKE_YYYY_MM_DD(19700101) == BOOST_VERSION_NUMBER(0,1,1)); - PREDEF_CHECK(BOOST_PREDEF_MAKE_YYYY_MM_DD(19710101) == BOOST_VERSION_NUMBER(1,1,1)); - PREDEF_CHECK(BOOST_PREDEF_MAKE_YYYY_MM_DD(20691231) == BOOST_VERSION_NUMBER(99,12,31)); + PREDEF_CHECK(BOOST_PREDEF_MAKE_YYYYMMDD(19700101) == BOOST_VERSION_NUMBER(0,1,1)); + PREDEF_CHECK(BOOST_PREDEF_MAKE_YYYYMMDD(19710101) == BOOST_VERSION_NUMBER(1,1,1)); + PREDEF_CHECK(BOOST_PREDEF_MAKE_YYYYMMDD(20691231) == BOOST_VERSION_NUMBER(99,12,31)); } int main() diff --git a/libs/predef/test/version.cpp b/libs/predef/test/version.cpp index b920207..747399a 100644 --- a/libs/predef/test/version.cpp +++ b/libs/predef/test/version.cpp @@ -1,5 +1,5 @@ /* -Copyright Redshift Software Inc 2011 +Copyright Redshift Software Inc 2011-2012 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)