From 6d4f26a2496ddcf0f36f55511a453242b693c3d0 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 3 Jan 2014 08:56:48 -0600 Subject: [PATCH 01/23] Add BOOST_PREDEF_VERSION def to indicate to users the version of this library. Bump version to 1.1 for development. --- doc/predef.qbk | 4 ++-- include/boost/predef/version.h | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 include/boost/predef/version.h diff --git a/doc/predef.qbk b/doc/predef.qbk index 5e39065..b893305 100644 --- a/doc/predef.qbk +++ b/doc/predef.qbk @@ -1,8 +1,8 @@ [article Predef [quickbook 1.7] - [version 1.0] + [version 1.1] [authors [Rivera, Rene]] - [copyright 2005 Rene Rivera, 2008-2013 Redshift Software Inc] + [copyright 2005, 2008-2014 Rene Rivera] [purpose Identification and specification of predefined macros.] [license Distributed under the Boost Software License, Version 1.0. diff --git a/include/boost/predef/version.h b/include/boost/predef/version.h new file mode 100644 index 0000000..1e85df7 --- /dev/null +++ b/include/boost/predef/version.h @@ -0,0 +1,15 @@ +/* +Copyright Rene Rivera 2014 +Distributed under the Boost Software License, Version 1.0. +(See accompanying file LICENSE_1_0.txt or copy at +http://www.boost.org/LICENSE_1_0.txt) +*/ + +#ifndef BOOST_PREDEF_VERSION_H +#define BOOST_PREDEF_VERSION_H + +#include + +#define BOOST_PREDEF_VERSION BOOST_VERSION_NUMBER(1,1,0) + +#endif From cfbef79d163ffb35caa13fe49c5a62f3ca941e40 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 3 Jan 2014 09:09:39 -0600 Subject: [PATCH 02/23] Start documenting future changes. --- doc/todo.qbk | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 doc/todo.qbk diff --git a/doc/todo.qbk b/doc/todo.qbk new file mode 100644 index 0000000..b5142e1 --- /dev/null +++ b/doc/todo.qbk @@ -0,0 +1,16 @@ +[/ +Copyright 2014 Rene Rivera +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) +] + +[section To Do] + +* Provide "exclusive" defs for compilers, OS, and others, that are exclusively + defined for the detected component. +* Improve reference documentation. +* Integrate Quickbook multi-include changes to main line Quickbook so that + Predef can be included in the global documentation. + +[endsect] From 58bfc7da8394191d7f30b5231b57b52fd688959a Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Thu, 9 Jan 2014 08:37:35 -0600 Subject: [PATCH 03/23] Comments on exclusive categories and defs. --- doc/todo.qbk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/todo.qbk b/doc/todo.qbk index b5142e1..375bca5 100644 --- a/doc/todo.qbk +++ b/doc/todo.qbk @@ -8,7 +8,10 @@ http://www.boost.org/LICENSE_1_0.txt) [section To Do] * Provide "exclusive" defs for compilers, OS, and others, that are exclusively - defined for the detected component. + defined for the detected component. Or do we follow what we do with OS detection + and keep the various category defs exclusive within the category (i.e. only + define one compiler, language, etc). Or is this something specific to the category? + Possible exclusive categories: architecture, compiler, platform. * Improve reference documentation. * Integrate Quickbook multi-include changes to main line Quickbook so that Predef can be included in the global documentation. From a3be72217a8ec7fae0e2ce0e7fbf816ebe78f53d Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Thu, 9 Jan 2014 08:44:37 -0600 Subject: [PATCH 04/23] Remove some reduntant #if-s from endian detection. --- include/boost/predef/other/endian.h | 40 +++++++++++++---------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/include/boost/predef/other/endian.h b/include/boost/predef/other/endian.h index 9d2a8bc..538561b 100644 --- a/include/boost/predef/other/endian.h +++ b/include/boost/predef/other/endian.h @@ -102,17 +102,15 @@ information and acquired knowledge: */ #if !BOOST_ENDIAN_BIG_BYTE && !BOOST_ENDIAN_BIG_WORD && \ !BOOST_ENDIAN_LITTLE_BYTE && !BOOST_ENDIAN_LITTLE_WORD -# if !BOOST_ENDIAN_BIG_BYTE -# if (defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__)) || \ - defined(__ARMEB__) || \ - defined(__THUMBEB__) || \ - defined(__AARCH64EB__) || \ - defined(_MIPSEB) || \ - defined(__MIPSEB) || \ - defined(__MIPSEB__) -# undef BOOST_ENDIAN_BIG_BYTE -# define BOOST_ENDIAN_BIG_BYTE BOOST_VERSION_NUMBER_AVAILABLE -# endif +# if (defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__)) || \ + defined(__ARMEB__) || \ + defined(__THUMBEB__) || \ + defined(__AARCH64EB__) || \ + defined(_MIPSEB) || \ + defined(__MIPSEB) || \ + defined(__MIPSEB__) +# undef BOOST_ENDIAN_BIG_BYTE +# define BOOST_ENDIAN_BIG_BYTE BOOST_VERSION_NUMBER_AVAILABLE # endif #endif @@ -120,17 +118,15 @@ information and acquired knowledge: */ #if !BOOST_ENDIAN_BIG_BYTE && !BOOST_ENDIAN_BIG_WORD && \ !BOOST_ENDIAN_LITTLE_BYTE && !BOOST_ENDIAN_LITTLE_WORD -# if !BOOST_ENDIAN_LITTLE_BYTE -# if (defined(__LITTLE_ENDIAN__) && !defined(__BIG_ENDIAN__)) || \ - defined(__ARMEL__) || \ - defined(__THUMBEL__) || \ - defined(__AARCH64EL__) || \ - defined(_MIPSEL) || \ - defined(__MIPSEL) || \ - defined(__MIPSEL__) -# undef BOOST_ENDIAN_LITTLE_BYTE -# define BOOST_ENDIAN_LITTLE_BYTE BOOST_VERSION_NUMBER_AVAILABLE -# endif +# if (defined(__LITTLE_ENDIAN__) && !defined(__BIG_ENDIAN__)) || \ + defined(__ARMEL__) || \ + defined(__THUMBEL__) || \ + defined(__AARCH64EL__) || \ + defined(_MIPSEL) || \ + defined(__MIPSEL) || \ + defined(__MIPSEL__) +# undef BOOST_ENDIAN_LITTLE_BYTE +# define BOOST_ENDIAN_LITTLE_BYTE BOOST_VERSION_NUMBER_AVAILABLE # endif #endif From 3ccc33fa28c676ef8e3dc1941f9d84a29f68b3f4 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 10 Jan 2014 08:46:03 -0600 Subject: [PATCH 05/23] Update copyrights back to original author. --- doc/build.jam | 2 +- include/boost/predef.h | 2 +- include/boost/predef/architecture.h | 2 +- include/boost/predef/architecture/alpha.h | 2 +- include/boost/predef/architecture/arm.h | 2 +- include/boost/predef/architecture/blackfin.h | 2 +- include/boost/predef/architecture/convex.h | 2 +- include/boost/predef/architecture/ia64.h | 2 +- include/boost/predef/architecture/m68k.h | 2 +- include/boost/predef/architecture/mips.h | 2 +- include/boost/predef/architecture/parisc.h | 2 +- include/boost/predef/architecture/ppc.h | 2 +- include/boost/predef/architecture/pyramid.h | 2 +- include/boost/predef/architecture/rs6k.h | 2 +- include/boost/predef/architecture/sparc.h | 2 +- include/boost/predef/architecture/superh.h | 2 +- include/boost/predef/architecture/sys370.h | 2 +- include/boost/predef/architecture/sys390.h | 2 +- include/boost/predef/architecture/x86.h | 2 +- include/boost/predef/architecture/x86/32.h | 2 +- include/boost/predef/architecture/x86/64.h | 2 +- include/boost/predef/architecture/z.h | 2 +- include/boost/predef/compiler.h | 2 +- include/boost/predef/compiler/borland.h | 2 +- include/boost/predef/compiler/clang.h | 2 +- include/boost/predef/compiler/comeau.h | 2 +- include/boost/predef/compiler/compaq.h | 2 +- include/boost/predef/compiler/diab.h | 2 +- include/boost/predef/compiler/digitalmars.h | 2 +- include/boost/predef/compiler/dignus.h | 2 +- include/boost/predef/compiler/edg.h | 2 +- include/boost/predef/compiler/ekopath.h | 2 +- include/boost/predef/compiler/gcc.h | 2 +- include/boost/predef/compiler/gcc_xml.h | 2 +- include/boost/predef/compiler/greenhills.h | 2 +- include/boost/predef/compiler/hp_acc.h | 2 +- include/boost/predef/compiler/iar.h | 2 +- include/boost/predef/compiler/ibm.h | 2 +- include/boost/predef/compiler/intel.h | 2 +- include/boost/predef/compiler/kai.h | 2 +- include/boost/predef/compiler/llvm.h | 2 +- include/boost/predef/compiler/metaware.h | 2 +- include/boost/predef/compiler/metrowerks.h | 2 +- include/boost/predef/compiler/microtec.h | 2 +- include/boost/predef/compiler/mpw.h | 2 +- include/boost/predef/compiler/palm.h | 2 +- include/boost/predef/compiler/pgi.h | 2 +- include/boost/predef/compiler/sgi_mipspro.h | 2 +- include/boost/predef/compiler/sunpro.h | 2 +- include/boost/predef/compiler/tendra.h | 2 +- include/boost/predef/compiler/visualc.h | 2 +- include/boost/predef/compiler/watcom.h | 2 +- include/boost/predef/detail/_cassert.h | 2 +- include/boost/predef/detail/_exception.h | 2 +- include/boost/predef/detail/endian_compat.h | 2 +- include/boost/predef/detail/os_detected.h | 2 +- include/boost/predef/detail/test.h | 2 +- include/boost/predef/language.h | 2 +- include/boost/predef/language/objc.h | 2 +- include/boost/predef/language/stdc.h | 2 +- include/boost/predef/language/stdcpp.h | 2 +- include/boost/predef/library.h | 2 +- include/boost/predef/library/c.h | 2 +- include/boost/predef/library/c/_prefix.h | 2 +- include/boost/predef/library/c/gnu.h | 2 +- include/boost/predef/library/c/uc.h | 2 +- include/boost/predef/library/c/vms.h | 2 +- include/boost/predef/library/c/zos.h | 2 +- include/boost/predef/library/std.h | 2 +- include/boost/predef/library/std/_prefix.h | 2 +- include/boost/predef/library/std/cxx.h | 2 +- include/boost/predef/library/std/dinkumware.h | 2 +- include/boost/predef/library/std/libcomo.h | 2 +- include/boost/predef/library/std/modena.h | 2 +- include/boost/predef/library/std/msl.h | 2 +- include/boost/predef/library/std/roguewave.h | 2 +- include/boost/predef/library/std/sgi.h | 2 +- include/boost/predef/library/std/stdcpp3.h | 2 +- include/boost/predef/library/std/stlport.h | 2 +- include/boost/predef/library/std/vacpp.h | 2 +- include/boost/predef/make.h | 2 +- include/boost/predef/os.h | 2 +- include/boost/predef/os/aix.h | 2 +- include/boost/predef/os/amigaos.h | 2 +- include/boost/predef/os/android.h | 2 +- include/boost/predef/os/beos.h | 2 +- include/boost/predef/os/bsd.h | 2 +- include/boost/predef/os/bsd/bsdi.h | 2 +- include/boost/predef/os/bsd/dragonfly.h | 2 +- include/boost/predef/os/bsd/free.h | 2 +- include/boost/predef/os/bsd/net.h | 2 +- include/boost/predef/os/bsd/open.h | 2 +- include/boost/predef/os/cygwin.h | 2 +- include/boost/predef/os/hpux.h | 2 +- include/boost/predef/os/irix.h | 2 +- include/boost/predef/os/linux.h | 2 +- include/boost/predef/os/macos.h | 2 +- include/boost/predef/os/os400.h | 2 +- include/boost/predef/os/qnxnto.h | 2 +- include/boost/predef/os/solaris.h | 2 +- include/boost/predef/os/unix.h | 2 +- include/boost/predef/os/vms.h | 2 +- include/boost/predef/os/windows.h | 2 +- include/boost/predef/other.h | 2 +- include/boost/predef/other/endian.h | 2 +- include/boost/predef/platform.h | 2 +- include/boost/predef/platform/mingw.h | 2 +- include/boost/predef/version_number.h | 2 +- jamroot.jam | 2 +- test/build.jam | 2 +- test/info_as_c.c | 2 +- test/info_as_cpp.cpp | 2 +- test/info_as_objc.m | 2 +- test/info_as_objcpp.mm | 2 +- test/macos_endian.c | 2 +- test/macos_vs_bsd.c | 2 +- test/make.cpp | 2 +- test/version.cpp | 2 +- 118 files changed, 118 insertions(+), 118 deletions(-) diff --git a/doc/build.jam b/doc/build.jam index 937bc2b..bf658ac 100644 --- a/doc/build.jam +++ b/doc/build.jam @@ -1,4 +1,4 @@ -# Copyright Redshift Software, Inc. 2011 +# Copyright Rene Rivera 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) diff --git a/include/boost/predef.h b/include/boost/predef.h index 8918aaf..753cd61 100644 --- a/include/boost/predef.h +++ b/include/boost/predef.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/architecture.h b/include/boost/predef/architecture.h index 9eda25e..b32701e 100644 --- a/include/boost/predef/architecture.h +++ b/include/boost/predef/architecture.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/architecture/alpha.h b/include/boost/predef/architecture/alpha.h index 7ccc480..6365ec4 100644 --- a/include/boost/predef/architecture/alpha.h +++ b/include/boost/predef/architecture/alpha.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/architecture/arm.h b/include/boost/predef/architecture/arm.h index b221a51..4c469a5 100644 --- a/include/boost/predef/architecture/arm.h +++ b/include/boost/predef/architecture/arm.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/architecture/blackfin.h b/include/boost/predef/architecture/blackfin.h index 7b4f275..ae3407e 100644 --- a/include/boost/predef/architecture/blackfin.h +++ b/include/boost/predef/architecture/blackfin.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software Inc 2013 +Copyright Rene Rivera 2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/architecture/convex.h b/include/boost/predef/architecture/convex.h index fbb8e96..3b425a0 100644 --- a/include/boost/predef/architecture/convex.h +++ b/include/boost/predef/architecture/convex.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software Inc 2011-2013 +Copyright Rene Rivera 2011-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/architecture/ia64.h b/include/boost/predef/architecture/ia64.h index 918e27f..4b5a103 100644 --- a/include/boost/predef/architecture/ia64.h +++ b/include/boost/predef/architecture/ia64.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/architecture/m68k.h b/include/boost/predef/architecture/m68k.h index 2950c9a..09c3cd3 100644 --- a/include/boost/predef/architecture/m68k.h +++ b/include/boost/predef/architecture/m68k.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/architecture/mips.h b/include/boost/predef/architecture/mips.h index b3d225c..ae88428 100644 --- a/include/boost/predef/architecture/mips.h +++ b/include/boost/predef/architecture/mips.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/architecture/parisc.h b/include/boost/predef/architecture/parisc.h index 7370383..e843dd2 100644 --- a/include/boost/predef/architecture/parisc.h +++ b/include/boost/predef/architecture/parisc.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/architecture/ppc.h b/include/boost/predef/architecture/ppc.h index 8339ed2..cc743e7 100644 --- a/include/boost/predef/architecture/ppc.h +++ b/include/boost/predef/architecture/ppc.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/architecture/pyramid.h b/include/boost/predef/architecture/pyramid.h index 706e0cd..26d5293 100644 --- a/include/boost/predef/architecture/pyramid.h +++ b/include/boost/predef/architecture/pyramid.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software Inc 2011-2013 +Copyright Rene Rivera 2011-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/architecture/rs6k.h b/include/boost/predef/architecture/rs6k.h index c05fefd..20dd64b 100644 --- a/include/boost/predef/architecture/rs6k.h +++ b/include/boost/predef/architecture/rs6k.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/architecture/sparc.h b/include/boost/predef/architecture/sparc.h index 30207a0..fc0af62 100644 --- a/include/boost/predef/architecture/sparc.h +++ b/include/boost/predef/architecture/sparc.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/architecture/superh.h b/include/boost/predef/architecture/superh.h index f87f492..ef88242 100644 --- a/include/boost/predef/architecture/superh.h +++ b/include/boost/predef/architecture/superh.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/architecture/sys370.h b/include/boost/predef/architecture/sys370.h index f2fba78..507ee86 100644 --- a/include/boost/predef/architecture/sys370.h +++ b/include/boost/predef/architecture/sys370.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/architecture/sys390.h b/include/boost/predef/architecture/sys390.h index a9e03d9..070117a 100644 --- a/include/boost/predef/architecture/sys390.h +++ b/include/boost/predef/architecture/sys390.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/architecture/x86.h b/include/boost/predef/architecture/x86.h index 3a08e9c..fa9a025 100644 --- a/include/boost/predef/architecture/x86.h +++ b/include/boost/predef/architecture/x86.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/architecture/x86/32.h b/include/boost/predef/architecture/x86/32.h index 131d94d..b796f84 100644 --- a/include/boost/predef/architecture/x86/32.h +++ b/include/boost/predef/architecture/x86/32.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/architecture/x86/64.h b/include/boost/predef/architecture/x86/64.h index 0bee9c9..a035c88 100644 --- a/include/boost/predef/architecture/x86/64.h +++ b/include/boost/predef/architecture/x86/64.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/architecture/z.h b/include/boost/predef/architecture/z.h index 622d6ab..768f342 100644 --- a/include/boost/predef/architecture/z.h +++ b/include/boost/predef/architecture/z.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler.h b/include/boost/predef/compiler.h index e83f449..12c4dfc 100644 --- a/include/boost/predef/compiler.h +++ b/include/boost/predef/compiler.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/borland.h b/include/boost/predef/compiler/borland.h index af9b527..436b268 100644 --- a/include/boost/predef/compiler/borland.h +++ b/include/boost/predef/compiler/borland.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/clang.h b/include/boost/predef/compiler/clang.h index 43f875c..d8a3c6a 100644 --- a/include/boost/predef/compiler/clang.h +++ b/include/boost/predef/compiler/clang.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/comeau.h b/include/boost/predef/compiler/comeau.h index e56659e..bf5a199 100644 --- a/include/boost/predef/compiler/comeau.h +++ b/include/boost/predef/compiler/comeau.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/compaq.h b/include/boost/predef/compiler/compaq.h index 26888fd..dd3ea8f 100644 --- a/include/boost/predef/compiler/compaq.h +++ b/include/boost/predef/compiler/compaq.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/diab.h b/include/boost/predef/compiler/diab.h index 365ba60..f30fbfc 100644 --- a/include/boost/predef/compiler/diab.h +++ b/include/boost/predef/compiler/diab.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/digitalmars.h b/include/boost/predef/compiler/digitalmars.h index f7e7d87..76a9343 100644 --- a/include/boost/predef/compiler/digitalmars.h +++ b/include/boost/predef/compiler/digitalmars.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/dignus.h b/include/boost/predef/compiler/dignus.h index 218c577..ba771fe 100644 --- a/include/boost/predef/compiler/dignus.h +++ b/include/boost/predef/compiler/dignus.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/edg.h b/include/boost/predef/compiler/edg.h index d73eedd..b0042c0 100644 --- a/include/boost/predef/compiler/edg.h +++ b/include/boost/predef/compiler/edg.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/ekopath.h b/include/boost/predef/compiler/ekopath.h index 72264fc..f2a9795 100644 --- a/include/boost/predef/compiler/ekopath.h +++ b/include/boost/predef/compiler/ekopath.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/gcc.h b/include/boost/predef/compiler/gcc.h index 7182dc9..93b38dc 100644 --- a/include/boost/predef/compiler/gcc.h +++ b/include/boost/predef/compiler/gcc.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/gcc_xml.h b/include/boost/predef/compiler/gcc_xml.h index d762c5d..0d7d026 100644 --- a/include/boost/predef/compiler/gcc_xml.h +++ b/include/boost/predef/compiler/gcc_xml.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/greenhills.h b/include/boost/predef/compiler/greenhills.h index 035eb0b..d6f5da9 100644 --- a/include/boost/predef/compiler/greenhills.h +++ b/include/boost/predef/compiler/greenhills.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/hp_acc.h b/include/boost/predef/compiler/hp_acc.h index 71581b9..eccac46 100644 --- a/include/boost/predef/compiler/hp_acc.h +++ b/include/boost/predef/compiler/hp_acc.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/iar.h b/include/boost/predef/compiler/iar.h index 94e82d4..cb491db 100644 --- a/include/boost/predef/compiler/iar.h +++ b/include/boost/predef/compiler/iar.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/ibm.h b/include/boost/predef/compiler/ibm.h index ab0385b..46221ee 100644 --- a/include/boost/predef/compiler/ibm.h +++ b/include/boost/predef/compiler/ibm.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/intel.h b/include/boost/predef/compiler/intel.h index 471397a..c749716 100644 --- a/include/boost/predef/compiler/intel.h +++ b/include/boost/predef/compiler/intel.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/kai.h b/include/boost/predef/compiler/kai.h index 002c310..3dfd2a4 100644 --- a/include/boost/predef/compiler/kai.h +++ b/include/boost/predef/compiler/kai.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/llvm.h b/include/boost/predef/compiler/llvm.h index 51587c6..77b20be 100644 --- a/include/boost/predef/compiler/llvm.h +++ b/include/boost/predef/compiler/llvm.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/metaware.h b/include/boost/predef/compiler/metaware.h index 61a555c..ad50c2f 100644 --- a/include/boost/predef/compiler/metaware.h +++ b/include/boost/predef/compiler/metaware.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/metrowerks.h b/include/boost/predef/compiler/metrowerks.h index e58c289..ecfecc6 100644 --- a/include/boost/predef/compiler/metrowerks.h +++ b/include/boost/predef/compiler/metrowerks.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/microtec.h b/include/boost/predef/compiler/microtec.h index 3c31667..4ff13e4 100644 --- a/include/boost/predef/compiler/microtec.h +++ b/include/boost/predef/compiler/microtec.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/mpw.h b/include/boost/predef/compiler/mpw.h index 1c8113e..fb20545 100644 --- a/include/boost/predef/compiler/mpw.h +++ b/include/boost/predef/compiler/mpw.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/palm.h b/include/boost/predef/compiler/palm.h index dec9c3b..766dc7c 100644 --- a/include/boost/predef/compiler/palm.h +++ b/include/boost/predef/compiler/palm.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/pgi.h b/include/boost/predef/compiler/pgi.h index 963a5aa..d1eb219 100644 --- a/include/boost/predef/compiler/pgi.h +++ b/include/boost/predef/compiler/pgi.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/sgi_mipspro.h b/include/boost/predef/compiler/sgi_mipspro.h index 1cc5833..4885094 100644 --- a/include/boost/predef/compiler/sgi_mipspro.h +++ b/include/boost/predef/compiler/sgi_mipspro.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/sunpro.h b/include/boost/predef/compiler/sunpro.h index 140700a..bb67de0 100644 --- a/include/boost/predef/compiler/sunpro.h +++ b/include/boost/predef/compiler/sunpro.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/tendra.h b/include/boost/predef/compiler/tendra.h index 227b1f7..79b2cdc 100644 --- a/include/boost/predef/compiler/tendra.h +++ b/include/boost/predef/compiler/tendra.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/visualc.h b/include/boost/predef/compiler/visualc.h index ccfdb83..eb46681 100644 --- a/include/boost/predef/compiler/visualc.h +++ b/include/boost/predef/compiler/visualc.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/watcom.h b/include/boost/predef/compiler/watcom.h index 6233b22..8d937c9 100644 --- a/include/boost/predef/compiler/watcom.h +++ b/include/boost/predef/compiler/watcom.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/detail/_cassert.h b/include/boost/predef/detail/_cassert.h index ca594a8..ccae495 100644 --- a/include/boost/predef/detail/_cassert.h +++ b/include/boost/predef/detail/_cassert.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2011-2012 +Copyright Rene Rivera 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/include/boost/predef/detail/_exception.h b/include/boost/predef/detail/_exception.h index 183dae7..ca58c79 100644 --- a/include/boost/predef/detail/_exception.h +++ b/include/boost/predef/detail/_exception.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2011-2012 +Copyright Rene Rivera 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/include/boost/predef/detail/endian_compat.h b/include/boost/predef/detail/endian_compat.h index b873659..7725e68 100644 --- a/include/boost/predef/detail/endian_compat.h +++ b/include/boost/predef/detail/endian_compat.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2013 +Copyright Rene Rivera 2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/detail/os_detected.h b/include/boost/predef/detail/os_detected.h index 7d70c1e..08e10f9 100644 --- a/include/boost/predef/detail/os_detected.h +++ b/include/boost/predef/detail/os_detected.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2013 +Copyright Rene Rivera 2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/detail/test.h b/include/boost/predef/detail/test.h index c75eccc..546a9e4 100644 --- a/include/boost/predef/detail/test.h +++ b/include/boost/predef/detail/test.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software Inc. 2011-2012 +Copyright Rene Rivera 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/include/boost/predef/language.h b/include/boost/predef/language.h index 6fc0cd5..c9251c5 100644 --- a/include/boost/predef/language.h +++ b/include/boost/predef/language.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software Inc. 2011-2012 +Copyright Rene Rivera 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/include/boost/predef/language/objc.h b/include/boost/predef/language/objc.h index dd48290..27a32b6 100644 --- a/include/boost/predef/language/objc.h +++ b/include/boost/predef/language/objc.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software Inc. 2011-2013 +Copyright Rene Rivera 2011-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/language/stdc.h b/include/boost/predef/language/stdc.h index 2495d74..59a4e0b 100644 --- a/include/boost/predef/language/stdc.h +++ b/include/boost/predef/language/stdc.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software Inc. 2011-2012 +Copyright Rene Rivera 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/include/boost/predef/language/stdcpp.h b/include/boost/predef/language/stdcpp.h index 1ccb8e8..693c67b 100644 --- a/include/boost/predef/language/stdcpp.h +++ b/include/boost/predef/language/stdcpp.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software Inc. 2011-2013 +Copyright Rene Rivera 2011-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/library.h b/include/boost/predef/library.h index 8b29c05..a474323 100644 --- a/include/boost/predef/library.h +++ b/include/boost/predef/library.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2012 +Copyright Rene Rivera 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/include/boost/predef/library/c.h b/include/boost/predef/library/c.h index 221e7dc..733e6a7 100644 --- a/include/boost/predef/library/c.h +++ b/include/boost/predef/library/c.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2012 +Copyright Rene Rivera 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/include/boost/predef/library/c/_prefix.h b/include/boost/predef/library/c/_prefix.h index 754601f..12bcb0f 100644 --- a/include/boost/predef/library/c/_prefix.h +++ b/include/boost/predef/library/c/_prefix.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/library/c/gnu.h b/include/boost/predef/library/c/gnu.h index a2bdfce..8ed9f76 100644 --- a/include/boost/predef/library/c/gnu.h +++ b/include/boost/predef/library/c/gnu.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/library/c/uc.h b/include/boost/predef/library/c/uc.h index 9b553a5..8b47de1 100644 --- a/include/boost/predef/library/c/uc.h +++ b/include/boost/predef/library/c/uc.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/library/c/vms.h b/include/boost/predef/library/c/vms.h index 5243dee..0357d05 100644 --- a/include/boost/predef/library/c/vms.h +++ b/include/boost/predef/library/c/vms.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/library/c/zos.h b/include/boost/predef/library/c/zos.h index c27f40d..4c6f058 100644 --- a/include/boost/predef/library/c/zos.h +++ b/include/boost/predef/library/c/zos.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/library/std.h b/include/boost/predef/library/std.h index 003f960..9ab0a86 100644 --- a/include/boost/predef/library/std.h +++ b/include/boost/predef/library/std.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/library/std/_prefix.h b/include/boost/predef/library/std/_prefix.h index 0c288e4..932b855 100644 --- a/include/boost/predef/library/std/_prefix.h +++ b/include/boost/predef/library/std/_prefix.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/library/std/cxx.h b/include/boost/predef/library/std/cxx.h index 2ca4dc3..1d0cf5f 100644 --- a/include/boost/predef/library/std/cxx.h +++ b/include/boost/predef/library/std/cxx.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software Inc 2011-2013 +Copyright Rene Rivera 2011-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/library/std/dinkumware.h b/include/boost/predef/library/std/dinkumware.h index 5357dad..394e866 100644 --- a/include/boost/predef/library/std/dinkumware.h +++ b/include/boost/predef/library/std/dinkumware.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/library/std/libcomo.h b/include/boost/predef/library/std/libcomo.h index 3c324ab..41bbe67 100644 --- a/include/boost/predef/library/std/libcomo.h +++ b/include/boost/predef/library/std/libcomo.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/library/std/modena.h b/include/boost/predef/library/std/modena.h index b87f489..fa7c061 100644 --- a/include/boost/predef/library/std/modena.h +++ b/include/boost/predef/library/std/modena.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/library/std/msl.h b/include/boost/predef/library/std/msl.h index b205b25..16ddec6 100644 --- a/include/boost/predef/library/std/msl.h +++ b/include/boost/predef/library/std/msl.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/library/std/roguewave.h b/include/boost/predef/library/std/roguewave.h index 7ca1266..38471d0 100644 --- a/include/boost/predef/library/std/roguewave.h +++ b/include/boost/predef/library/std/roguewave.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/library/std/sgi.h b/include/boost/predef/library/std/sgi.h index b8e7807..16f0db1 100644 --- a/include/boost/predef/library/std/sgi.h +++ b/include/boost/predef/library/std/sgi.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/library/std/stdcpp3.h b/include/boost/predef/library/std/stdcpp3.h index cab5644..19ebc86 100644 --- a/include/boost/predef/library/std/stdcpp3.h +++ b/include/boost/predef/library/std/stdcpp3.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/library/std/stlport.h b/include/boost/predef/library/std/stlport.h index eba82bc..1b6cebb 100644 --- a/include/boost/predef/library/std/stlport.h +++ b/include/boost/predef/library/std/stlport.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/library/std/vacpp.h b/include/boost/predef/library/std/vacpp.h index eb11572..1c259c5 100644 --- a/include/boost/predef/library/std/vacpp.h +++ b/include/boost/predef/library/std/vacpp.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/make.h b/include/boost/predef/make.h index ccee24a..d327906 100644 --- a/include/boost/predef/make.h +++ b/include/boost/predef/make.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/os.h b/include/boost/predef/os.h index 942fee6..3aceb3a 100644 --- a/include/boost/predef/os.h +++ b/include/boost/predef/os.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2012 +Copyright Rene Rivera 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/include/boost/predef/os/aix.h b/include/boost/predef/os/aix.h index 3c155c1..6495fb2 100644 --- a/include/boost/predef/os/aix.h +++ b/include/boost/predef/os/aix.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/os/amigaos.h b/include/boost/predef/os/amigaos.h index 0f665d4..81354f2 100644 --- a/include/boost/predef/os/amigaos.h +++ b/include/boost/predef/os/amigaos.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/os/android.h b/include/boost/predef/os/android.h index 09b74d7..69593e5 100644 --- a/include/boost/predef/os/android.h +++ b/include/boost/predef/os/android.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2013 +Copyright Rene Rivera 2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/os/beos.h b/include/boost/predef/os/beos.h index 90b7d62..349857d 100644 --- a/include/boost/predef/os/beos.h +++ b/include/boost/predef/os/beos.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/os/bsd.h b/include/boost/predef/os/bsd.h index 0adc435..ad4c1c8 100644 --- a/include/boost/predef/os/bsd.h +++ b/include/boost/predef/os/bsd.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/os/bsd/bsdi.h b/include/boost/predef/os/bsd/bsdi.h index 71ea87a..09e8a29 100644 --- a/include/boost/predef/os/bsd/bsdi.h +++ b/include/boost/predef/os/bsd/bsdi.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2012-2013 +Copyright Rene Rivera 2012-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/os/bsd/dragonfly.h b/include/boost/predef/os/bsd/dragonfly.h index 9d37439..20d7aae 100644 --- a/include/boost/predef/os/bsd/dragonfly.h +++ b/include/boost/predef/os/bsd/dragonfly.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2012-2013 +Copyright Rene Rivera 2012-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/os/bsd/free.h b/include/boost/predef/os/bsd/free.h index 321d3a3..93f49a2 100644 --- a/include/boost/predef/os/bsd/free.h +++ b/include/boost/predef/os/bsd/free.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2012-2013 +Copyright Rene Rivera 2012-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/os/bsd/net.h b/include/boost/predef/os/bsd/net.h index 2a34538..09e4d50 100644 --- a/include/boost/predef/os/bsd/net.h +++ b/include/boost/predef/os/bsd/net.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2012-2013 +Copyright Rene Rivera 2012-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/os/bsd/open.h b/include/boost/predef/os/bsd/open.h index 2f51644..401ccae 100644 --- a/include/boost/predef/os/bsd/open.h +++ b/include/boost/predef/os/bsd/open.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2012-2013 +Copyright Rene Rivera 2012-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/os/cygwin.h b/include/boost/predef/os/cygwin.h index 8de0ee6..9ffab86 100644 --- a/include/boost/predef/os/cygwin.h +++ b/include/boost/predef/os/cygwin.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/os/hpux.h b/include/boost/predef/os/hpux.h index a6a117e..e764d9c 100644 --- a/include/boost/predef/os/hpux.h +++ b/include/boost/predef/os/hpux.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/os/irix.h b/include/boost/predef/os/irix.h index d719510..cc10552 100644 --- a/include/boost/predef/os/irix.h +++ b/include/boost/predef/os/irix.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/os/linux.h b/include/boost/predef/os/linux.h index 315bc3e..2c07c68 100644 --- a/include/boost/predef/os/linux.h +++ b/include/boost/predef/os/linux.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/os/macos.h b/include/boost/predef/os/macos.h index e625a6c..f71ddfb 100644 --- a/include/boost/predef/os/macos.h +++ b/include/boost/predef/os/macos.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/os/os400.h b/include/boost/predef/os/os400.h index 62524bc..2154189 100644 --- a/include/boost/predef/os/os400.h +++ b/include/boost/predef/os/os400.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software Inc 2011-2013 +Copyright Rene Rivera 2011-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/os/qnxnto.h b/include/boost/predef/os/qnxnto.h index a221923..1ba324c 100644 --- a/include/boost/predef/os/qnxnto.h +++ b/include/boost/predef/os/qnxnto.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/os/solaris.h b/include/boost/predef/os/solaris.h index 3de77ad..df5240b 100644 --- a/include/boost/predef/os/solaris.h +++ b/include/boost/predef/os/solaris.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/os/unix.h b/include/boost/predef/os/unix.h index 23afa4f..6739e09 100644 --- a/include/boost/predef/os/unix.h +++ b/include/boost/predef/os/unix.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/os/vms.h b/include/boost/predef/os/vms.h index c63ede2..2e0868e 100644 --- a/include/boost/predef/os/vms.h +++ b/include/boost/predef/os/vms.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software Inc 2011-2013 +Copyright Rene Rivera 2011-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/os/windows.h b/include/boost/predef/os/windows.h index 1316963..c22eef1 100644 --- a/include/boost/predef/os/windows.h +++ b/include/boost/predef/os/windows.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/other.h b/include/boost/predef/other.h index a9c40a3..04aad16 100644 --- a/include/boost/predef/other.h +++ b/include/boost/predef/other.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2013 +Copyright Rene Rivera 2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/other/endian.h b/include/boost/predef/other/endian.h index 538561b..88f20e0 100644 --- a/include/boost/predef/other/endian.h +++ b/include/boost/predef/other/endian.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2013 +Copyright Rene Rivera 2013-2014 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/platform.h b/include/boost/predef/platform.h index 5d2b179..b2f8825 100644 --- a/include/boost/predef/platform.h +++ b/include/boost/predef/platform.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2013 +Copyright Rene Rivera 2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/platform/mingw.h b/include/boost/predef/platform/mingw.h index 9bd7a5c..f48e4c9 100644 --- a/include/boost/predef/platform/mingw.h +++ b/include/boost/predef/platform/mingw.h @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/version_number.h b/include/boost/predef/version_number.h index 2ecccd2..b773919 100644 --- a/include/boost/predef/version_number.h +++ b/include/boost/predef/version_number.h @@ -1,6 +1,6 @@ /* Copyright Rene Rivera 2005 -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/jamroot.jam b/jamroot.jam index cc14498..8c06f09 100644 --- a/jamroot.jam +++ b/jamroot.jam @@ -1,4 +1,4 @@ -# Copyright Redshift Software Inc. 2011 +# Copyright Rene Rivera 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) diff --git a/test/build.jam b/test/build.jam index 27587fc..c01fe09 100755 --- a/test/build.jam +++ b/test/build.jam @@ -1,5 +1,5 @@ #!/usr/bin/env b2 -a --verbose-test -# Copyright Redshift Software, Inc. 2011-2013 +# Copyright Rene Rivera 2011-2013 # Distributed under the Boost Software License, Version 1.0. # (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) diff --git a/test/info_as_c.c b/test/info_as_c.c index c6e8078..fe26e84 100644 --- a/test/info_as_c.c +++ b/test/info_as_c.c @@ -1,5 +1,5 @@ /* -Copyright Redshift Software Inc. 2011-2012 +Copyright Rene Rivera 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/test/info_as_cpp.cpp b/test/info_as_cpp.cpp index 92245ad..e484312 100644 --- a/test/info_as_cpp.cpp +++ b/test/info_as_cpp.cpp @@ -1,5 +1,5 @@ /* -Copyright Redshift Software Inc. 2011-2012 +Copyright Rene Rivera 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/test/info_as_objc.m b/test/info_as_objc.m index ce1d08e..79dc80f 100644 --- a/test/info_as_objc.m +++ b/test/info_as_objc.m @@ -1,5 +1,5 @@ /* -Copyright Redshift Software Inc. 2011 +Copyright Rene Rivera 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) diff --git a/test/info_as_objcpp.mm b/test/info_as_objcpp.mm index 2176eea..5d8c92a 100644 --- a/test/info_as_objcpp.mm +++ b/test/info_as_objcpp.mm @@ -1,5 +1,5 @@ /* -Copyright Redshift Software Inc. 2011 +Copyright Rene Rivera 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) diff --git a/test/macos_endian.c b/test/macos_endian.c index 9a9b5a6..7f29f90 100644 --- a/test/macos_endian.c +++ b/test/macos_endian.c @@ -1,5 +1,5 @@ /* -Copyright Redshift Software Inc. 2013 +Copyright Rene Rivera 2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/test/macos_vs_bsd.c b/test/macos_vs_bsd.c index b22cb44..173b5a4 100644 --- a/test/macos_vs_bsd.c +++ b/test/macos_vs_bsd.c @@ -1,5 +1,5 @@ /* -Copyright Redshift Software Inc. 2013 +Copyright Rene Rivera 2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/test/make.cpp b/test/make.cpp index 8f55932..9dbd4a8 100644 --- a/test/make.cpp +++ b/test/make.cpp @@ -1,5 +1,5 @@ /* -Copyright Redshift Software Inc 2011-2013 +Copyright Rene Rivera 2011-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/test/version.cpp b/test/version.cpp index 713ab48..c2df3b9 100644 --- a/test/version.cpp +++ b/test/version.cpp @@ -1,5 +1,5 @@ /* -Copyright Redshift Software Inc 2011-2012 +Copyright Rene Rivera 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) From a3a555610cd6de6f2fa26195fae95f2bdb703f8a Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Thu, 16 Jan 2014 15:50:19 -0600 Subject: [PATCH 06/23] Initial implementation of exclusive definition of compiler detection with emulated definitions. --- include/boost/predef/compiler/borland.h | 25 +++++++++---- include/boost/predef/compiler/clang.h | 19 ++++++++-- include/boost/predef/compiler/comeau.h | 25 +++++++++---- include/boost/predef/compiler/compaq.h | 29 ++++++++++----- include/boost/predef/compiler/diab.h | 19 ++++++++-- include/boost/predef/compiler/digitalmars.h | 19 ++++++++-- include/boost/predef/compiler/dignus.h | 19 ++++++++-- include/boost/predef/compiler/edg.h | 19 ++++++++-- include/boost/predef/compiler/ekopath.h | 19 ++++++++-- include/boost/predef/compiler/gcc.h | 29 +++++++++++---- include/boost/predef/compiler/gcc_xml.h | 19 ++++++++-- include/boost/predef/compiler/greenhills.h | 29 ++++++++++----- include/boost/predef/compiler/hp_acc.h | 25 +++++++++---- include/boost/predef/compiler/iar.h | 19 ++++++++-- include/boost/predef/compiler/ibm.h | 33 +++++++++++------ include/boost/predef/compiler/intel.h | 25 +++++++++---- include/boost/predef/compiler/kai.h | 19 ++++++++-- include/boost/predef/compiler/llvm.h | 23 ++++++++++-- include/boost/predef/compiler/metaware.h | 19 ++++++++-- include/boost/predef/compiler/metrowerks.h | 41 +++++++++++++-------- include/boost/predef/compiler/microtec.h | 19 ++++++++-- include/boost/predef/compiler/mpw.h | 25 +++++++++---- include/boost/predef/compiler/palm.h | 19 ++++++++-- include/boost/predef/compiler/pgi.h | 25 +++++++++---- include/boost/predef/compiler/sgi_mipspro.h | 29 ++++++++++----- include/boost/predef/compiler/sunpro.h | 29 ++++++++++----- include/boost/predef/compiler/tendra.h | 19 ++++++++-- include/boost/predef/compiler/visualc.h | 23 ++++++++++-- include/boost/predef/compiler/watcom.h | 19 ++++++++-- include/boost/predef/detail/comp_detected.h | 10 +++++ 30 files changed, 516 insertions(+), 175 deletions(-) create mode 100644 include/boost/predef/detail/comp_detected.h diff --git a/include/boost/predef/compiler/borland.h b/include/boost/predef/compiler/borland.h index 436b268..01b5de7 100644 --- a/include/boost/predef/compiler/borland.h +++ b/include/boost/predef/compiler/borland.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2014 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -31,17 +31,23 @@ Version number available as major, minor, and patch. #define BOOST_COMP_BORLAND BOOST_VERSION_NUMBER_NOT_AVAILABLE #if defined(__BORLANDC__) || defined(__CODEGEARC__) -# undef BOOST_COMP_BORLAND -# if !defined(BOOST_COMP_BORLAND) && (defined(__CODEGEARC__)) -# define BOOST_COMP_BORLAND BOOST_PREDEF_MAKE_0X_VVRP(__CODEGEARC__) +# if !defined(BOOST_COMP_BORLAND_DETECTION) && (defined(__CODEGEARC__)) +# define BOOST_COMP_BORLAND_DETECTION BOOST_PREDEF_MAKE_0X_VVRP(__CODEGEARC__) # endif -# if !defined(BOOST_COMP_BORLAND) -# define BOOST_COMP_BORLAND BOOST_PREDEF_MAKE_0X_VVRP(__BORLANDC__) +# if !defined(BOOST_COMP_BORLAND_DETECTION) +# define BOOST_COMP_BORLAND_DETECTION BOOST_PREDEF_MAKE_0X_VVRP(__BORLANDC__) # endif #endif -#if BOOST_COMP_BORLAND +#ifdef BOOST_COMP_BORLAND_DETECTION # define BOOST_COMP_BORLAND_AVAILABLE +# if defined(BOOST_PREDEF_DETAIL_COMP_DETECTED) +# define BOOST_COMP_BORLAND_EMULATED BOOST_COMP_BORLAND_DETECTION +# else +# undef BOOST_COMP_BORLAND +# define BOOST_COMP_BORLAND BOOST_COMP_BORLAND_DETECTION +# endif +# include #endif #define BOOST_COMP_BORLAND_NAME "Borland C++" @@ -49,5 +55,10 @@ Version number available as major, minor, and patch. #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_BORLAND,BOOST_COMP_BORLAND_NAME) +#ifdef BOOST_COMP_BORLAND_EMULATED +#include +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_BORLAND_EMULATED,BOOST_COMP_BORLAND_NAME) +#endif + #endif diff --git a/include/boost/predef/compiler/clang.h b/include/boost/predef/compiler/clang.h index d8a3c6a..87dd033 100644 --- a/include/boost/predef/compiler/clang.h +++ b/include/boost/predef/compiler/clang.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2014 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -29,12 +29,18 @@ Version number available as major, minor, and patch. #define BOOST_COMP_CLANG BOOST_VERSION_NUMBER_NOT_AVAILABLE #if defined(__clang__) -# undef BOOST_COMP_CLANG -# define BOOST_COMP_CLANG BOOST_VERSION_NUMBER(__clang_major__,__clang_minor__,__clang_patchlevel__) +# define BOOST_COMP_CLANG_DETECTION BOOST_VERSION_NUMBER(__clang_major__,__clang_minor__,__clang_patchlevel__) #endif -#if BOOST_COMP_CLANG +#ifdef BOOST_COMP_CLANG_DETECTION +# if defined(BOOST_PREDEF_DETAIL_COMP_DETECTED) +# define BOOST_COMP_CLANG_EMULATED BOOST_COMP_CLANG_DETECTION +# else +# undef BOOST_COMP_CLANG +# define BOOST_COMP_CLANG BOOST_COMP_CLANG_DETECTION +# endif # define BOOST_COMP_CLANG_AVAILABLE +# include #endif #define BOOST_COMP_CLANG_NAME "Clang" @@ -42,5 +48,10 @@ Version number available as major, minor, and patch. #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_CLANG,BOOST_COMP_CLANG_NAME) +#ifdef BOOST_COMP_CLANG_EMULATED +#include +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_CLANG_EMULATED,BOOST_COMP_CLANG_NAME) +#endif + #endif diff --git a/include/boost/predef/compiler/comeau.h b/include/boost/predef/compiler/comeau.h index bf5a199..3862184 100644 --- a/include/boost/predef/compiler/comeau.h +++ b/include/boost/predef/compiler/comeau.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2014 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -29,17 +29,23 @@ Version number available as major, minor, and patch. */ #if defined(__COMO__) -# undef BOOST_COMP_COMO -# if !defined(BOOST_COMP_COMO) && defined(__CONO_VERSION__) -# define BOOST_COMP_COMO BOOST_PREDEF_MAKE_0X_VRP(__COMO_VERSION__) +# if !defined(BOOST_COMP_COMO_DETECTION) && defined(__CONO_VERSION__) +# define BOOST_COMP_COMO_DETECTION BOOST_PREDEF_MAKE_0X_VRP(__COMO_VERSION__) # endif -# if !defined(BOOST_COMP_COMO) -# define BOOST_COMP_COMO BOOST_VERSION_NUMBER_AVAILABLE +# if !defined(BOOST_COMP_COMO_DETECTION) +# define BOOST_COMP_COMO_DETECTION BOOST_VERSION_NUMBER_AVAILABLE # endif #endif -#if BOOST_COMP_COMO +#ifdef BOOST_COMP_COMO_DETECTION +# if defined(BOOST_PREDEF_DETAIL_COMP_DETECTED) +# define BOOST_COMP_COMO_EMULATED BOOST_COMP_COMO_DETECTION +# else +# undef BOOST_COMP_COMO +# define BOOST_COMP_COMO BOOST_COMP_COMO_DETECTION +# endif # define BOOST_COMP_COMO_AVAILABLE +# include #endif #define BOOST_COMP_COMO_NAME "Comeau C++" @@ -47,5 +53,10 @@ Version number available as major, minor, and patch. #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_COMO,BOOST_COMP_COMO_NAME) +#ifdef BOOST_COMP_COMO_EMULATED +#include +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_COMO_EMULATED,BOOST_COMP_COMO_NAME) +#endif + #endif diff --git a/include/boost/predef/compiler/compaq.h b/include/boost/predef/compiler/compaq.h index dd3ea8f..a922d17 100644 --- a/include/boost/predef/compiler/compaq.h +++ b/include/boost/predef/compiler/compaq.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2014 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -31,20 +31,26 @@ Version number available as major, minor, and patch. #define BOOST_COMP_DEC BOOST_VERSION_NUMBER_NOT_AVAILABLE #if defined(__DECC) || defined(__DECCXX) -# undef BOOST_COMP_DEC -# if !defined(BOOST_COMP_DEC) && defined(__DECCXX_VER) -# define BOOST_COMP_DEC BOOST_PREDEF_MAKE_10_VVRR0PP00(__DECCXX_VER) +# if !defined(BOOST_COMP_DEC_DETECTION) && defined(__DECCXX_VER) +# define BOOST_COMP_DEC_DETECTION BOOST_PREDEF_MAKE_10_VVRR0PP00(__DECCXX_VER) # endif -# if !defined(BOOST_COMP_DEC) && defined(__DECC_VER) -# define BOOST_COMP_DEC BOOST_PREDEF_MAKE_10_VVRR0PP00(__DECC_VER) +# if !defined(BOOST_COMP_DEC_DETECTION) && defined(__DECC_VER) +# define BOOST_COMP_DEC_DETECTION BOOST_PREDEF_MAKE_10_VVRR0PP00(__DECC_VER) # endif -# if !defined(BOOST_COMP_DEC) -# define BOOST_COM_DEV BOOST_VERSION_NUMBER_AVAILABLE +# if !defined(BOOST_COMP_DEC_DETECTION) +# define BOOST_COM_DEC_DETECTION BOOST_VERSION_NUMBER_AVAILABLE # endif #endif -#if BOOST_COMP_DEC +#ifdef BOOST_COMP_DEC_DETECTION +# if defined(BOOST_PREDEF_DETAIL_COMP_DETECTED) +# define BOOST_COMP_DEC_EMULATED BOOST_COMP_DEC_DETECTION +# else +# undef BOOST_COMP_DEC +# define BOOST_COMP_DEC BOOST_COMP_DEC_DETECTION +# endif # define BOOST_COMP_DEC_AVAILABLE +# include #endif #define BOOST_COMP_DEC_NAME "Compaq C/C++" @@ -52,5 +58,10 @@ Version number available as major, minor, and patch. #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_DEC,BOOST_COMP_DEC_NAME) +#ifdef BOOST_COMP_DEC_EMULATED +#include +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_DEC_EMULATED,BOOST_COMP_DEC_NAME) +#endif + #endif diff --git a/include/boost/predef/compiler/diab.h b/include/boost/predef/compiler/diab.h index f30fbfc..2cba03b 100644 --- a/include/boost/predef/compiler/diab.h +++ b/include/boost/predef/compiler/diab.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2014 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -29,12 +29,18 @@ Version number available as major, minor, and patch. #define BOOST_COMP_DIAB BOOST_VERSION_NUMBER_NOT_AVAILABLE #if defined(__DCC__) -# undef BOOST_COMP_DIAB -# define BOOST_COMP_DIAB BOOST_PREDEF_MAKE_10_VRPP(__VERSION_NUMBER__) +# define BOOST_COMP_DIAB_DETECTION BOOST_PREDEF_MAKE_10_VRPP(__VERSION_NUMBER__) #endif -#if BOOST_COMP_DIAB +#ifdef BOOST_COMP_DIAB_DETECTION +# if defined(BOOST_PREDEF_DETAIL_COMP_DETECTED) +# define BOOST_COMP_DIAB_EMULATED BOOST_COMP_DIAB_DETECTION +# else +# undef BOOST_COMP_DIAB +# define BOOST_COMP_DIAB BOOST_COMP_DIAB_DETECTION +# endif # define BOOST_COMP_DIAB_AVAILABLE +# include #endif #define BOOST_COMP_DIAB_NAME "Diab C/C++" @@ -42,5 +48,10 @@ Version number available as major, minor, and patch. #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_DIAB,BOOST_COMP_DIAB_NAME) +#ifdef BOOST_COMP_DIAB_EMULATED +#include +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_DIAB_EMULATED,BOOST_COMP_DIAB_NAME) +#endif + #endif diff --git a/include/boost/predef/compiler/digitalmars.h b/include/boost/predef/compiler/digitalmars.h index 76a9343..2306a7e 100644 --- a/include/boost/predef/compiler/digitalmars.h +++ b/include/boost/predef/compiler/digitalmars.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2014 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -29,12 +29,18 @@ Version number available as major, minor, and patch. #define BOOST_COMP_DMC BOOST_VERSION_NUMBER_NOT_AVAILABLE #if defined(__DMC__) -# undef BOOST_COMP_DMC -# define BOOST_COMP_DMC BOOST_PREDEF_MAKE_0X_VRP(__DMC__) +# define BOOST_COMP_DMC_DETECTION BOOST_PREDEF_MAKE_0X_VRP(__DMC__) #endif -#if BOOST_COMP_DMC +#ifdef BOOST_COMP_DMC_DETECTION +# if defined(BOOST_PREDEF_DETAIL_COMP_DETECTED) +# define BOOST_COMP_DMC_EMULATED BOOST_COMP_DMC_DETECTION +# else +# undef BOOST_COMP_DMC +# define BOOST_COMP_DMC BOOST_COMP_DMC_DETECTION +# endif # define BOOST_COMP_DMC_AVAILABLE +# include #endif #define BOOST_COMP_DMC_NAME "Digital Mars" @@ -42,5 +48,10 @@ Version number available as major, minor, and patch. #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_DMC,BOOST_COMP_DMC_NAME) +#ifdef BOOST_COMP_DMC_EMULATED +#include +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_DMC_EMULATED,BOOST_COMP_DMC_NAME) +#endif + #endif diff --git a/include/boost/predef/compiler/dignus.h b/include/boost/predef/compiler/dignus.h index ba771fe..33c3560 100644 --- a/include/boost/predef/compiler/dignus.h +++ b/include/boost/predef/compiler/dignus.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2014 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -29,12 +29,18 @@ Version number available as major, minor, and patch. #define BOOST_COMP_SYSC BOOST_VERSION_NUMBER_NOT_AVAILABLE #if defined(__SYSC__) -# undef BOOST_COMP_SYSC -# define BOOST_COMP_SYSC BOOST_PREDEF_MAKE_10_VRRPP(__SYSC_VER__) +# define BOOST_COMP_SYSC_DETECTION BOOST_PREDEF_MAKE_10_VRRPP(__SYSC_VER__) #endif -#if BOOST_COMP_SYSC +#ifdef BOOST_COMP_SYSC_DETECTION +# if defined(BOOST_PREDEF_DETAIL_COMP_DETECTED) +# define BOOST_COMP_SYSC_EMULATED BOOST_COMP_SYSC_DETECTION +# else +# undef BOOST_COMP_SYSC +# define BOOST_COMP_SYSC BOOST_COMP_SYSC_DETECTION +# endif # define BOOST_COMP_SYSC_AVAILABLE +# include #endif #define BOOST_COMP_SYSC_NAME "Dignus Systems/C++" @@ -42,5 +48,10 @@ Version number available as major, minor, and patch. #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_SYSC,BOOST_COMP_SYSC_NAME) +#ifdef BOOST_COMP_SYSC_EMULATED +#include +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_SYSC_EMULATED,BOOST_COMP_SYSC_NAME) +#endif + #endif diff --git a/include/boost/predef/compiler/edg.h b/include/boost/predef/compiler/edg.h index b0042c0..d53a5ff 100644 --- a/include/boost/predef/compiler/edg.h +++ b/include/boost/predef/compiler/edg.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2014 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -29,12 +29,18 @@ Version number available as major, minor, and patch. #define BOOST_COMP_EDG BOOST_VERSION_NUMBER_NOT_AVAILABLE #if defined(__EDG__) -# undef BOOST_COMP_EDG -# define BOOST_COMP_EDG BOOST_PREDEF_MAKE_10_VRR(__EDG_VERSION__) +# define BOOST_COMP_EDG_DETECTION BOOST_PREDEF_MAKE_10_VRR(__EDG_VERSION__) #endif -#if BOOST_COMP_EDG +#ifdef BOOST_COMP_EDG_DETECTION +# if defined(BOOST_PREDEF_DETAIL_COMP_DETECTED) +# define BOOST_COMP_EDG_EMULATED BOOST_COMP_EDG_DETECTION +# else +# undef BOOST_COMP_EDG +# define BOOST_COMP_EDG BOOST_COMP_EDG_DETECTION +# endif # define BOOST_COMP_EDG_AVAILABLE +# include #endif #define BOOST_COMP_EDG_NAME "EDG C++ Frontend" @@ -42,5 +48,10 @@ Version number available as major, minor, and patch. #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_EDG,BOOST_COMP_EDG_NAME) +#ifdef BOOST_COMP_EDG_EMULATED +#include +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_EDG_EMULATED,BOOST_COMP_EDG_NAME) +#endif + #endif diff --git a/include/boost/predef/compiler/ekopath.h b/include/boost/predef/compiler/ekopath.h index f2a9795..4d7dabe 100644 --- a/include/boost/predef/compiler/ekopath.h +++ b/include/boost/predef/compiler/ekopath.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2014 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -29,13 +29,19 @@ Version number available as major, minor, and patch. #define BOOST_COMP_PATH BOOST_VERSION_NUMBER_NOT_AVAILABLE #if defined(__PATHCC__) -# undef BOOST_COMP_PATH -# define BOOST_COMP_PATH \ +# define BOOST_COMP_PATH_DETECTION \ BOOST_VERSION_NUMBER(__PATHCC__,__PATHCC_MINOR__,__PATHCC_PATCHLEVEL__) #endif -#if BOOST_COMP_PATH +#ifdef BOOST_COMP_PATH_DETECTION +# if defined(BOOST_PREDEF_DETAIL_COMP_DETECTED) +# define BOOST_COMP_PATH_EMULATED BOOST_COMP_PATH_DETECTION +# else +# undef BOOST_COMP_PATH +# define BOOST_COMP_PATH BOOST_COMP_PATH_DETECTION +# endif # define BOOST_COMP_PATH_AVAILABLE +# include #endif #define BOOST_COMP_PATH_NAME "EKOpath" @@ -43,5 +49,10 @@ Version number available as major, minor, and patch. #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_PATH,BOOST_COMP_PATH_NAME) +#ifdef BOOST_COMP_PATH_EMULATED +#include +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_PATH_EMULATED,BOOST_COMP_PATH_NAME) +#endif + #endif diff --git a/include/boost/predef/compiler/gcc.h b/include/boost/predef/compiler/gcc.h index 93b38dc..5b226bd 100644 --- a/include/boost/predef/compiler/gcc.h +++ b/include/boost/predef/compiler/gcc.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2014 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -8,6 +8,10 @@ http://www.boost.org/LICENSE_1_0.txt) #ifndef BOOST_PREDEF_COMPILER_GCC_H #define BOOST_PREDEF_COMPILER_GCC_H +/* Other compilers that emulate this one need to be detected first. */ + +#include + #include #include @@ -30,19 +34,25 @@ Version number available as major, minor, and patch (if available). #define BOOST_COMP_GNUC BOOST_VERSION_NUMBER_NOT_AVAILABLE #if defined(__GNUC__) -# undef BOOST_COMP_GNUC -# if !defined(BOOST_COMP_GNUC) && defined(__GNUC_PATCHLEVEL__) -# define BOOST_COMP_GNUC \ +# if !defined(BOOST_COMP_GNUC_DETECTION) && defined(__GNUC_PATCHLEVEL__) +# define BOOST_COMP_GNUC_DETECTION \ BOOST_VERSION_NUMBER(__GNUC__,__GNUC_MINOR__,__GNUC_PATCHLEVEL__) # endif -# if !defined(BOOST_COMP_GNUC) -# define BOOST_COMP_GNUC \ +# if !defined(BOOST_COMP_GNUC_DETECTION) +# define BOOST_COMP_GNUC_DETECTION \ BOOST_VERSION_NUMBER(__GNUC__,__GNUC_MINOR__,0) # endif #endif -#if BOOST_COMP_GNUC +#ifdef BOOST_COMP_GNUC_DETECTION +# if defined(BOOST_PREDEF_DETAIL_COMP_DETECTED) +# define BOOST_COMP_GNUC_EMULATED BOOST_COMP_GNUC_DETECTION +# else +# undef BOOST_COMP_GNUC +# define BOOST_COMP_GNUC BOOST_COMP_GNUC_DETECTION +# endif # define BOOST_COMP_GNUC_AVAILABLE +# include #endif #define BOOST_COMP_GNUC_NAME "Gnu GCC C/C++" @@ -50,5 +60,10 @@ Version number available as major, minor, and patch (if available). #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_GNUC,BOOST_COMP_GNUC_NAME) +#ifdef BOOST_COMP_GNUC_EMULATED +#include +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_GNUC_EMULATED,BOOST_COMP_GNUC_NAME) +#endif + #endif diff --git a/include/boost/predef/compiler/gcc_xml.h b/include/boost/predef/compiler/gcc_xml.h index 0d7d026..ef55f5d 100644 --- a/include/boost/predef/compiler/gcc_xml.h +++ b/include/boost/predef/compiler/gcc_xml.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2014 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -26,12 +26,18 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_COMP_GCCXML BOOST_VERSION_NUMBER_NOT_AVAILABLE #if defined(__GCCXML__) -# undef BOOST_COMP_GCCXML -# define BOOST_COMP_GCCXML BOOST_VERSION_NUMBER_AVAILABLE +# define BOOST_COMP_GCCXML_DETECTION BOOST_VERSION_NUMBER_AVAILABLE #endif -#if BOOST_COMP_GCCXML +#ifdef BOOST_COMP_GCCXML_DETECTION +# if defined(BOOST_PREDEF_DETAIL_COMP_DETECTED) +# define BOOST_COMP_GCCXML_EMULATED BOOST_COMP_GCCXML_DETECTION +# else +# undef BOOST_COMP_GCCXML +# define BOOST_COMP_GCCXML BOOST_COMP_GCCXML_DETECTION +# endif # define BOOST_COMP_GCCXML_AVAILABLE +# include #endif #define BOOST_COMP_GCCXML_NAME "GCC XML" @@ -39,4 +45,9 @@ http://www.boost.org/LICENSE_1_0.txt) #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_GCCXML,BOOST_COMP_GCCXML_NAME) +#ifdef BOOST_COMP_GCCXML_EMULATED +#include +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_GCCXML_EMULATED,BOOST_COMP_GCCXML_NAME) +#endif + #endif diff --git a/include/boost/predef/compiler/greenhills.h b/include/boost/predef/compiler/greenhills.h index d6f5da9..462f57b 100644 --- a/include/boost/predef/compiler/greenhills.h +++ b/include/boost/predef/compiler/greenhills.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2014 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -31,20 +31,26 @@ Version number available as major, minor, and patch. #define BOOST_COMP_GHS BOOST_VERSION_NUMBER_NOT_AVAILABLE #if defined(__ghs) || defined(__ghs__) -# undef BOOST_COMP_GHS -# if !defined(BOOST_COMP_GHS) && defined(__GHS_VERSION_NUMBER__) -# define BOOST_COMP_GHS BOOST_PREDEF_MAKE_10_VRP(__GHS_VERSION_NUMBER__) +# if !defined(BOOST_COMP_GHS_DETECTION) && defined(__GHS_VERSION_NUMBER__) +# define BOOST_COMP_GHS_DETECTION BOOST_PREDEF_MAKE_10_VRP(__GHS_VERSION_NUMBER__) # endif -# if !defined(BOOST_COMP_GHS) && defined(__ghs) -# define BOOST_COMP_GHS BOOST_PREDEF_MAKE_10_VRP(__ghs) +# if !defined(BOOST_COMP_GHS_DETECTION) && defined(__ghs) +# define BOOST_COMP_GHS_DETECTION BOOST_PREDEF_MAKE_10_VRP(__ghs) # endif -# if !defined(BOOST_COMP_GHS) -# define BOOST_COMP_GHS BOOST_VERSION_NUMBER_AVAILABLE +# if !defined(BOOST_COMP_GHS_DETECTION) +# define BOOST_COMP_GHS_DETECTION BOOST_VERSION_NUMBER_AVAILABLE # endif #endif -#if BOOST_COMP_GHS +#ifdef BOOST_COMP_GHS_DETECTION +# if defined(BOOST_PREDEF_DETAIL_COMP_DETECTED) +# define BOOST_COMP_GHS_EMULATED BOOST_COMP_GHS_DETECTION +# else +# undef BOOST_COMP_GHS +# define BOOST_COMP_GHS BOOST_COMP_GHS_DETECTION +# endif # define BOOST_COMP_GHS_AVAILABLE +# include #endif #define BOOST_COMP_GHS_NAME "Green Hills C/C++" @@ -52,5 +58,10 @@ Version number available as major, minor, and patch. #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_GHS,BOOST_COMP_GHS_NAME) +#ifdef BOOST_COMP_GHS_EMULATED +#include +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_GHS_EMULATED,BOOST_COMP_GHS_NAME) +#endif + #endif diff --git a/include/boost/predef/compiler/hp_acc.h b/include/boost/predef/compiler/hp_acc.h index eccac46..8cb7022 100644 --- a/include/boost/predef/compiler/hp_acc.h +++ b/include/boost/predef/compiler/hp_acc.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2014 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -29,17 +29,23 @@ Version number available as major, minor, and patch. #define BOOST_COMP_HPACC BOOST_VERSION_NUMBER_NOT_AVAILABLE #if defined(__HP_aCC) -# undef BOOST_COMP_HPACC -# if !defined(BOOST_COMP_HPACC) && (__HP_aCC > 1) -# define BOOST_COMP_HPACC BOOST_PREDEF_MAKE_10_VVRRPP(__HP_aCC) +# if !defined(BOOST_COMP_HPACC_DETECTION) && (__HP_aCC > 1) +# define BOOST_COMP_HPACC_DETECTION BOOST_PREDEF_MAKE_10_VVRRPP(__HP_aCC) # endif -# if !defined(BOOST_COMP_HPACC) -# define BOOST_COMP_HPACC BOOST_VERSION_NUMBER_AVAILABLE +# if !defined(BOOST_COMP_HPACC_DETECTION) +# define BOOST_COMP_HPACC_DETECTION BOOST_VERSION_NUMBER_AVAILABLE # endif #endif -#if BOOST_COMP_HPACC +#ifdef BOOST_COMP_HPACC_DETECTION +# if defined(BOOST_PREDEF_DETAIL_COMP_DETECTED) +# define BOOST_COMP_HPACC_EMULATED BOOST_COMP_HPACC_DETECTION +# else +# undef BOOST_COMP_HPACC +# define BOOST_COMP_HPACC BOOST_COMP_HPACC_DETECTION +# endif # define BOOST_COMP_HPACC_AVAILABLE +# include #endif #define BOOST_COMP_HPACC_NAME "HP aC++" @@ -47,5 +53,10 @@ Version number available as major, minor, and patch. #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_HPACC,BOOST_COMP_HPACC_NAME) +#ifdef BOOST_COMP_HPACC_EMULATED +#include +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_HPACC_EMULATED,BOOST_COMP_HPACC_NAME) +#endif + #endif diff --git a/include/boost/predef/compiler/iar.h b/include/boost/predef/compiler/iar.h index cb491db..dd6bc0e 100644 --- a/include/boost/predef/compiler/iar.h +++ b/include/boost/predef/compiler/iar.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2014 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -29,12 +29,18 @@ Version number available as major, minor, and patch. #define BOOST_COMP_IAR BOOST_VERSION_NUMBER_NOT_AVAILABLE #if defined(__IAR_SYSTEMS_ICC__) -# undef BOOST_COMP_IAR -# define BOOST_COMP_IAR BOOST_PREDEF_MAKE_10_VVRR(__VER__) +# define BOOST_COMP_IAR_DETECTION BOOST_PREDEF_MAKE_10_VVRR(__VER__) #endif -#if BOOST_COMP_IAR +#ifdef BOOST_COMP_IAR_DETECTION +# if defined(BOOST_PREDEF_DETAIL_COMP_DETECTED) +# define BOOST_COMP_IAR_EMULATED BOOST_COMP_IAR_DETECTION +# else +# undef BOOST_COMP_IAR +# define BOOST_COMP_IAR BOOST_COMP_IAR_DETECTION +# endif # define BOOST_COMP_IAR_AVAILABLE +# include #endif #define BOOST_COMP_IAR_NAME "IAR C/C++" @@ -42,5 +48,10 @@ Version number available as major, minor, and patch. #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_IAR,BOOST_COMP_IAR_NAME) +#ifdef BOOST_COMP_IAR_EMULATED +#include +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_IAR_EMULATED,BOOST_COMP_IAR_NAME) +#endif + #endif diff --git a/include/boost/predef/compiler/ibm.h b/include/boost/predef/compiler/ibm.h index 46221ee..1edc93c 100644 --- a/include/boost/predef/compiler/ibm.h +++ b/include/boost/predef/compiler/ibm.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2014 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -34,23 +34,29 @@ Version number available as major, minor, and patch. #define BOOST_COMP_IBM BOOST_VERSION_NUMBER_NOT_AVAILABLE #if defined(__IBMCPP__) || defined(__xlC__) || defined(__xlc__) -# undef BOOST_COMP_IBM -# if !defined(BOOST_COMP_IBM) && defined(__COMPILER_VER__) -# define BOOST_COMP_IBM BOOST_PREDEF_MAKE_0X_VRRPPPP(__COMPILER_VER__) +# if !defined(BOOST_COMP_IBM_DETECTION) && defined(__COMPILER_VER__) +# define BOOST_COMP_IBM_DETECTION BOOST_PREDEF_MAKE_0X_VRRPPPP(__COMPILER_VER__) # endif -# if !defined(BOOST_COMP_IBM) && defined(__xlC__) -# define BOOST_COMP_IBM BOOST_PREDEF_MAKE_0X_VVRR(__xlC__) +# if !defined(BOOST_COMP_IBM_DETECTION) && defined(__xlC__) +# define BOOST_COMP_IBM_DETECTION BOOST_PREDEF_MAKE_0X_VVRR(__xlC__) # endif -# if !defined(BOOST_COMP_IBM) && defined(__xlc__) -# define BOOST_COMP_IBM BOOST_PREDEF_MAKE_0X_VVRR(__xlc__) +# if !defined(BOOST_COMP_IBM_DETECTION) && defined(__xlc__) +# define BOOST_COMP_IBM_DETECTION BOOST_PREDEF_MAKE_0X_VVRR(__xlc__) # endif -# if !defined(BOOST_COMP_IBM) -# define BOOST_COMP_IBM BOOST_PREDEF_MAKE_10_VRP(__IBMCPP__) +# if !defined(BOOST_COMP_IBM_DETECTION) +# define BOOST_COMP_IBM_DETECTION BOOST_PREDEF_MAKE_10_VRP(__IBMCPP__) # endif #endif -#if BOOST_COMP_IBM +#ifdef BOOST_COMP_IBM_DETECTION +# if defined(BOOST_PREDEF_DETAIL_COMP_DETECTED) +# define BOOST_COMP_IBM_EMULATED BOOST_COMP_IBM_DETECTION +# else +# undef BOOST_COMP_IBM +# define BOOST_COMP_IBM BOOST_COMP_IBM_DETECTION +# endif # define BOOST_COMP_IBM_AVAILABLE +# include #endif #define BOOST_COMP_IBM_NAME "IBM XL C/C++" @@ -58,5 +64,10 @@ Version number available as major, minor, and patch. #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_IBM,BOOST_COMP_IBM_NAME) +#ifdef BOOST_COMP_IBM_EMULATED +#include +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_IBM_EMULATED,BOOST_COMP_IBM_NAME) +#endif + #endif diff --git a/include/boost/predef/compiler/intel.h b/include/boost/predef/compiler/intel.h index c749716..60220c7 100644 --- a/include/boost/predef/compiler/intel.h +++ b/include/boost/predef/compiler/intel.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2014 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -33,17 +33,23 @@ Version number available as major, minor, and patch. #if defined(__INTEL_COMPILER) || defined(__ICL) || defined(__ICC) || \ defined(__ECC) -# undef BOOST_COMP_INTEL -# if !defined(BOOST_COMP_INTEL) && defined(__INTEL_COMPILER) -# define BOOST_COMP_INTEL BOOST_PREDEF_MAKE_10_VRP(__INTEL_COMPILER) +# if !defined(BOOST_COMP_INTEL_DETECTION) && defined(__INTEL_COMPILER) +# define BOOST_COMP_INTEL_DETECTION BOOST_PREDEF_MAKE_10_VRP(__INTEL_COMPILER) # endif -# if !defined(BOOST_COMP_INTEL) -# define BOOST_COMP_INTEL BOOST_VERSION_NUMBER_AVAILABLE +# if !defined(BOOST_COMP_INTEL_DETECTION) +# define BOOST_COMP_INTEL_DETECTION BOOST_VERSION_NUMBER_AVAILABLE # endif #endif -#if BOOST_COMP_INTEL +#ifdef BOOST_COMP_INTEL_DETECTION +# if defined(BOOST_PREDEF_DETAIL_COMP_DETECTED) +# define BOOST_COMP_INTEL_EMULATED BOOST_COMP_INTEL_DETECTION +# else +# undef BOOST_COMP_INTEL +# define BOOST_COMP_INTEL BOOST_COMP_INTEL_DETECTION +# endif # define BOOST_COMP_INTEL_AVAILABLE +# include #endif #define BOOST_COMP_INTEL_NAME "Intel C/C++" @@ -51,5 +57,10 @@ Version number available as major, minor, and patch. #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_INTEL,BOOST_COMP_INTEL_NAME) +#ifdef BOOST_COMP_INTEL_EMULATED +#include +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_INTEL_EMULATED,BOOST_COMP_INTEL_NAME) +#endif + #endif diff --git a/include/boost/predef/compiler/kai.h b/include/boost/predef/compiler/kai.h index 3dfd2a4..4aadbe3 100644 --- a/include/boost/predef/compiler/kai.h +++ b/include/boost/predef/compiler/kai.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2014 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -29,12 +29,18 @@ Version number available as major, minor, and patch. #define BOOST_COMP_KCC BOOST_VERSION_NUMBER_NOT_AVAILABLE #if defined(__KCC) -# undef BOOST_COMP_KCC -# define BOOST_COMP_KCC BOOST_PREDEF_MAKE_0X_VRPP(__KCC_VERSION) +# define BOOST_COMP_KCC_DETECTION BOOST_PREDEF_MAKE_0X_VRPP(__KCC_VERSION) #endif -#if BOOST_COMP_KCC +#ifdef BOOST_COMP_KCC_DETECTION +# if defined(BOOST_PREDEF_DETAIL_COMP_DETECTED) +# define BOOST_COMP_KCC_EMULATED BOOST_COMP_KCC_DETECTION +# else +# undef BOOST_COMP_KCC +# define BOOST_COMP_KCC BOOST_COMP_KCC_DETECTION +# endif # define BOOST_COMP_KCC_AVAILABLE +# include #endif #define BOOST_COMP_KCC_NAME "Kai C++" @@ -42,5 +48,10 @@ Version number available as major, minor, and patch. #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_KCC,BOOST_COMP_KCC_NAME) +#ifdef BOOST_COMP_KCC_EMULATED +#include +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_KCC_EMULATED,BOOST_COMP_KCC_NAME) +#endif + #endif diff --git a/include/boost/predef/compiler/llvm.h b/include/boost/predef/compiler/llvm.h index 77b20be..c7e634c 100644 --- a/include/boost/predef/compiler/llvm.h +++ b/include/boost/predef/compiler/llvm.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2014 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -8,6 +8,10 @@ http://www.boost.org/LICENSE_1_0.txt) #ifndef BOOST_PREDEF_COMPILER_LLVM_H #define BOOST_PREDEF_COMPILER_LLVM_H +/* Other compilers that emulate this one need to be detected first. */ + +#include + #include #include @@ -26,12 +30,18 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_COMP_LLVM BOOST_VERSION_NUMBER_NOT_AVAILABLE #if defined(__llvm__) -# undef BOOST_COMP_LLVM -# define BOOST_COMP_LLVM BOOST_VERSION_NUMBER_AVAILABLE +# define BOOST_COMP_LLVM_DETECTION BOOST_VERSION_NUMBER_AVAILABLE #endif -#if BOOST_COMP_LLVM +#ifdef BOOST_COMP_LLVM_DETECTION +# if defined(BOOST_PREDEF_DETAIL_COMP_DETECTED) +# define BOOST_COMP_LLVM_EMULATED BOOST_COMP_LLVM_DETECTION +# else +# undef BOOST_COMP_LLVM +# define BOOST_COMP_LLVM BOOST_COMP_LLVM_DETECTION +# endif # define BOOST_COMP_LLVM_AVAILABLE +# include #endif #define BOOST_COMP_LLVM_NAME "LLVM" @@ -39,5 +49,10 @@ http://www.boost.org/LICENSE_1_0.txt) #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_LLVM,BOOST_COMP_LLVM_NAME) +#ifdef BOOST_COMP_LLVM_EMULATED +#include +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_LLVM_EMULATED,BOOST_COMP_LLVM_NAME) +#endif + #endif diff --git a/include/boost/predef/compiler/metaware.h b/include/boost/predef/compiler/metaware.h index ad50c2f..5e13de8 100644 --- a/include/boost/predef/compiler/metaware.h +++ b/include/boost/predef/compiler/metaware.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2014 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -26,12 +26,18 @@ MetaWare High C/C++ compiler. #define BOOST_COMP_HIGHC BOOST_VERSION_NUMBER_NOT_AVAILABLE #if defined(__HIGHC__) -# undef BOOST_COMP_HIGHC -# define BOOST_COMP_HIGHC BOOST_VERSION_NUMBER_AVAILABLE +# define BOOST_COMP_HIGHC_DETECTION BOOST_VERSION_NUMBER_AVAILABLE #endif -#if BOOST_COMP_HIGHC +#ifdef BOOST_COMP_HIGHC_DETECTION +# if defined(BOOST_PREDEF_DETAIL_COMP_DETECTED) +# define BOOST_COMP_HIGHC_EMULATED BOOST_COMP_HIGHC_DETECTION +# else +# undef BOOST_COMP_HIGHC +# define BOOST_COMP_HIGHC BOOST_COMP_HIGHC_DETECTION +# endif # define BOOST_COMP_HIGHC_AVAILABLE +# include #endif #define BOOST_COMP_HIGHC_NAME "MetaWare High C/C++" @@ -39,5 +45,10 @@ MetaWare High C/C++ compiler. #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_HIGHC,BOOST_COMP_HIGHC_NAME) +#ifdef BOOST_COMP_HIGHC_EMULATED +#include +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_HIGHC_EMULATED,BOOST_COMP_HIGHC_NAME) +#endif + #endif diff --git a/include/boost/predef/compiler/metrowerks.h b/include/boost/predef/compiler/metrowerks.h index ecfecc6..409282b 100644 --- a/include/boost/predef/compiler/metrowerks.h +++ b/include/boost/predef/compiler/metrowerks.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2014 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -33,29 +33,35 @@ Version number available as major, minor, and patch. #define BOOST_COMP_MWERKS BOOST_VERSION_NUMBER_NOT_AVAILABLE #if defined(__MWERKS__) || defined(__CWCC__) -# undef BOOST_COMP_MWERKS -# if !defined(BOOST_COMP_MWERKS) && defined(__CWCC__) -# define BOOST_COMP_MWERKS BOOST_PREDEF_MAKE_0X_VRPP(__CWCC__) +# if !defined(BOOST_COMP_MWERKS_DETECTION) && defined(__CWCC__) +# define BOOST_COMP_MWERKS_DETECTION BOOST_PREDEF_MAKE_0X_VRPP(__CWCC__) # endif -# if !defined(BOOST_COMP_MWERKS) && (__MWERKS__ >= 0x4200) -# define BOOST_COMP_MWERKS BOOST_PREDEF_MAKE_0X_VRPP(__MWERKS__) +# if !defined(BOOST_COMP_MWERKS_DETECTION) && (__MWERKS__ >= 0x4200) +# define BOOST_COMP_MWERKS_DETECTION BOOST_PREDEF_MAKE_0X_VRPP(__MWERKS__) # endif -# if !defined(BOOST_COMP_MWERKS) && (__MWERKS__ >= 0x3204) // note the "skip": 04->9.3 -# define BOOST_COMP_MWERKS BOOST_VERSION_NUMBER(9,(__MWERKS__)%100-1,0) +# if !defined(BOOST_COMP_MWERKS_DETECTION) && (__MWERKS__ >= 0x3204) // note the "skip": 04->9.3 +# define BOOST_COMP_MWERKS_DETECTION BOOST_VERSION_NUMBER(9,(__MWERKS__)%100-1,0) # endif -# if !defined(BOOST_COMP_MWERKS) && (__MWERKS__ >= 0x3200) -# define BOOST_COMP_MWERKS BOOST_VERSION_NUMBER(9,(__MWERKS__)%100,0) +# if !defined(BOOST_COMP_MWERKS_DETECTION) && (__MWERKS__ >= 0x3200) +# define BOOST_COMP_MWERKS_DETECTION BOOST_VERSION_NUMBER(9,(__MWERKS__)%100,0) # endif -# if !defined(BOOST_COMP_MWERKS) && (__MWERKS__ >= 0x3000) -# define BOOST_COMP_MWERKS BOOST_VERSION_NUMBER(8,(__MWERKS__)%100,0) +# if !defined(BOOST_COMP_MWERKS_DETECTION) && (__MWERKS__ >= 0x3000) +# define BOOST_COMP_MWERKS_DETECTION BOOST_VERSION_NUMBER(8,(__MWERKS__)%100,0) # endif -# if !defined(BOOST_COMP_MWERKS) -# define BOOST_COMP_MWERKS BOOST_VERSION_NUMBER_AVAILABLE +# if !defined(BOOST_COMP_MWERKS_DETECTION) +# define BOOST_COMP_MWERKS_DETECTION BOOST_VERSION_NUMBER_AVAILABLE # endif #endif -#if BOOST_COMP_MWERKS +#ifdef BOOST_COMP_MWERKS_DETECTION +# if defined(BOOST_PREDEF_DETAIL_COMP_DETECTED) +# define BOOST_COMP_MWERKS_EMULATED BOOST_COMP_MWERKS_DETECTION +# else +# undef BOOST_COMP_MWERKS +# define BOOST_COMP_MWERKS BOOST_COMP_MWERKS_DETECTION +# endif # define BOOST_COMP_MWERKS_AVAILABLE +# include #endif #define BOOST_COMP_MWERKS_NAME "Metrowerks CodeWarrior" @@ -63,5 +69,10 @@ Version number available as major, minor, and patch. #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_MWERKS,BOOST_COMP_MWERKS_NAME) +#ifdef BOOST_COMP_MWERKS_EMULATED +#include +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_MWERKS_EMULATED,BOOST_COMP_MWERKS_NAME) +#endif + #endif diff --git a/include/boost/predef/compiler/microtec.h b/include/boost/predef/compiler/microtec.h index 4ff13e4..6bd6279 100644 --- a/include/boost/predef/compiler/microtec.h +++ b/include/boost/predef/compiler/microtec.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2014 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -26,12 +26,18 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_COMP_MRI BOOST_VERSION_NUMBER_NOT_AVAILABLE #if defined(_MRI) -# undef BOOST_COMP_MRI -# define BOOST_COMP_MRI BOOST_VERSION_NUMBER_AVAILABLE +# define BOOST_COMP_MRI_DETECTION BOOST_VERSION_NUMBER_AVAILABLE #endif -#if BOOST_COMP_MRI +#ifdef BOOST_COMP_MRI_DETECTION +# if defined(BOOST_PREDEF_DETAIL_COMP_DETECTED) +# define BOOST_COMP_MRI_EMULATED BOOST_COMP_MRI_DETECTION +# else +# undef BOOST_COMP_MRI +# define BOOST_COMP_MRI BOOST_COMP_MRI_DETECTION +# endif # define BOOST_COMP_MRI_AVAILABLE +# include #endif #define BOOST_COMP_MRI_NAME "Microtec C/C++" @@ -39,5 +45,10 @@ http://www.boost.org/LICENSE_1_0.txt) #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_MRI,BOOST_COMP_MRI_NAME) +#ifdef BOOST_COMP_MRI_EMULATED +#include +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_MRI_EMULATED,BOOST_COMP_MRI_NAME) +#endif + #endif diff --git a/include/boost/predef/compiler/mpw.h b/include/boost/predef/compiler/mpw.h index fb20545..3a48f6f 100644 --- a/include/boost/predef/compiler/mpw.h +++ b/include/boost/predef/compiler/mpw.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2014 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -31,17 +31,23 @@ Version number available as major, and minor. #define BOOST_COMP_MPW BOOST_VERSION_NUMBER_NOT_AVAILABLE #if defined(__MRC__) || defined(MPW_C) || defined(MPW_CPLUS) -# undef BOOST_COMP_MPW -# if !defined(BOOST_COMP_MPW) && defined(__MRC__) -# define BOOST_COMP_MPW BOOST_PREDEF_MAKE_0X_VVRR(__MRC__) +# if !defined(BOOST_COMP_MPW_DETECTION) && defined(__MRC__) +# define BOOST_COMP_MPW_DETECTION BOOST_PREDEF_MAKE_0X_VVRR(__MRC__) # endif -# if !defined(BOOST_COMP_MPW) -# define BOOST_COMP_MPW BOOST_VERSION_NUMBER_AVAILABLE +# if !defined(BOOST_COMP_MPW_DETECTION) +# define BOOST_COMP_MPW_DETECTION BOOST_VERSION_NUMBER_AVAILABLE # endif #endif -#if BOOST_COMP_MPW +#ifdef BOOST_COMP_MPW_DETECTION +# if defined(BOOST_PREDEF_DETAIL_COMP_DETECTED) +# define BOOST_COMP_MPW_EMULATED BOOST_COMP_MPW_DETECTION +# else +# undef BOOST_COMP_MPW +# define BOOST_COMP_MPW BOOST_COMP_MPW_DETECTION +# endif # define BOOST_COMP_MPW_AVAILABLE +# include #endif #define BOOST_COMP_MPW_NAME "MPW C++" @@ -49,5 +55,10 @@ Version number available as major, and minor. #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_MPW,BOOST_COMP_MPW_NAME) +#ifdef BOOST_COMP_MPW_EMULATED +#include +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_MPW_EMULATED,BOOST_COMP_MPW_NAME) +#endif + #endif diff --git a/include/boost/predef/compiler/palm.h b/include/boost/predef/compiler/palm.h index 766dc7c..eb1da97 100644 --- a/include/boost/predef/compiler/palm.h +++ b/include/boost/predef/compiler/palm.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2014 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -29,12 +29,18 @@ Version number available as major, minor, and patch. #define BOOST_COMP_PALM BOOST_VERSION_NUMBER_NOT_AVAILABLE #if defined(_PACC_VER) -# undef BOOST_COMP_PALM -# define BOOST_COMP_PALM BOOST_PREDEF_MAKE_0X_VRRPP000(_PACC_VER) +# define BOOST_COMP_PALM_DETECTION BOOST_PREDEF_MAKE_0X_VRRPP000(_PACC_VER) #endif -#if BOOST_COMP_PALM +#ifdef BOOST_COMP_PALM_DETECTION +# if defined(BOOST_PREDEF_DETAIL_COMP_DETECTED) +# define BOOST_COMP_PALM_EMULATED BOOST_COMP_PALM_DETECTION +# else +# undef BOOST_COMP_PALM +# define BOOST_COMP_PALM BOOST_COMP_PALM_DETECTION +# endif # define BOOST_COMP_PALM_AVAILABLE +# include #endif #define BOOST_COMP_PALM_NAME "Palm C/C++" @@ -42,5 +48,10 @@ Version number available as major, minor, and patch. #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_PALM,BOOST_COMP_PALM_NAME) +#ifdef BOOST_COMP_PALM_EMULATED +#include +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_PALM_EMULATED,BOOST_COMP_PALM_NAME) +#endif + #endif diff --git a/include/boost/predef/compiler/pgi.h b/include/boost/predef/compiler/pgi.h index d1eb219..563335f 100644 --- a/include/boost/predef/compiler/pgi.h +++ b/include/boost/predef/compiler/pgi.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2014 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -28,17 +28,23 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_COMP_PGI BOOST_VERSION_NUMBER_NOT_AVAILABLE #if defined(__PGI) -# undef BOOST_COMP_PGI -# if !defined(BOOST_COMP_PGI) && (defined(__PGIC__) && defined(__PGIC_MINOR__) && defined(__PGIC_PATCHLEVEL__)) -# define BOOST_COMP_PGI BOOST_VERSION_NUMBER(__PGIC__,__PGIC_MINOR__,__PGIC_PATCHLEVEL__) +# if !defined(BOOST_COMP_PGI_DETECTION) && (defined(__PGIC__) && defined(__PGIC_MINOR__) && defined(__PGIC_PATCHLEVEL__)) +# define BOOST_COMP_PGI_DETECTION BOOST_VERSION_NUMBER(__PGIC__,__PGIC_MINOR__,__PGIC_PATCHLEVEL__) # endif -# if !defined(BOOST_COMP_PGI) -# define BOOST_COMP_PGI BOOST_VERSION_NUMBER_AVAILABLE +# if !defined(BOOST_COMP_PGI_DETECTION) +# define BOOST_COMP_PGI_DETECTION BOOST_VERSION_NUMBER_AVAILABLE # endif #endif -#if BOOST_COMP_PGI +#ifdef BOOST_COMP_PGI_DETECTION +# if defined(BOOST_PREDEF_DETAIL_COMP_DETECTED) +# define BOOST_COMP_PGI_EMULATED BOOST_COMP_PGI_DETECTION +# else +# undef BOOST_COMP_PGI +# define BOOST_COMP_PGI BOOST_COMP_PGI_DETECTION +# endif # define BOOST_COMP_PGI_AVAILABLE +# include #endif #define BOOST_COMP_PGI_NAME "Portland Group C/C++" @@ -46,5 +52,10 @@ http://www.boost.org/LICENSE_1_0.txt) #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_PGI,BOOST_COMP_PGI_NAME) +#ifdef BOOST_COMP_PGI_EMULATED +#include +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_PGI_EMULATED,BOOST_COMP_PGI_NAME) +#endif + #endif diff --git a/include/boost/predef/compiler/sgi_mipspro.h b/include/boost/predef/compiler/sgi_mipspro.h index 4885094..c212b19 100644 --- a/include/boost/predef/compiler/sgi_mipspro.h +++ b/include/boost/predef/compiler/sgi_mipspro.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2014 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -31,20 +31,26 @@ Version number available as major, minor, and patch. #define BOOST_COMP_SGI BOOST_VERSION_NUMBER_NOT_AVAILABLE #if defined(__sgi) || defined(sgi) -# undef BOOST_COMP_SGI -# if !defined(BOOST_COMP_SGI) && defined(_SGI_COMPILER_VERSION) -# define BOOST_COMP_SGI BOOST_PREDEF_MAKE_10_VRP(_SGI_COMPILER_VERSION) +# if !defined(BOOST_COMP_SGI_DETECTION) && defined(_SGI_COMPILER_VERSION) +# define BOOST_COMP_SGI_DETECTION BOOST_PREDEF_MAKE_10_VRP(_SGI_COMPILER_VERSION) # endif -# if !defined(BOOST_COMP_SGI) && defined(_COMPILER_VERSION) -# define BOOST_COMP_SGI BOOST_PREDEF_MAKE_10_VRP(_COMPILER_VERSION) +# if !defined(BOOST_COMP_SGI_DETECTION) && defined(_COMPILER_VERSION) +# define BOOST_COMP_SGI_DETECTION BOOST_PREDEF_MAKE_10_VRP(_COMPILER_VERSION) # endif -# if !defined(BOOST_COMP_SGI) -# define BOOST_COMP_SGI BOOST_VERSION_NUMBER_AVAILABLE +# if !defined(BOOST_COMP_SGI_DETECTION) +# define BOOST_COMP_SGI_DETECTION BOOST_VERSION_NUMBER_AVAILABLE # endif #endif -#if BOOST_COMP_SGI +#ifdef BOOST_COMP_SGI_DETECTION +# if defined(BOOST_PREDEF_DETAIL_COMP_DETECTED) +# define BOOST_COMP_SGI_EMULATED BOOST_COMP_SGI_DETECTION +# else +# undef BOOST_COMP_SGI +# define BOOST_COMP_SGI BOOST_COMP_SGI_DETECTION +# endif # define BOOST_COMP_SGI_AVAILABLE +# include #endif #define BOOST_COMP_SGI_NAME "SGI MIPSpro" @@ -52,5 +58,10 @@ Version number available as major, minor, and patch. #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_SGI,BOOST_COMP_SGI_NAME) +#ifdef BOOST_COMP_SGI_EMULATED +#include +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_SGI_EMULATED,BOOST_COMP_SGI_NAME) +#endif + #endif diff --git a/include/boost/predef/compiler/sunpro.h b/include/boost/predef/compiler/sunpro.h index bb67de0..bd3da27 100644 --- a/include/boost/predef/compiler/sunpro.h +++ b/include/boost/predef/compiler/sunpro.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2014 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -31,20 +31,26 @@ Version number available as major, minor, and patch. #define BOOST_COMP_SUNPRO BOOST_VERSION_NUMBER_NOT_AVAILABLE #if defined(__SUNPRO_CC) || defined(__SUNPRO_C) -# undef BOOST_COMP_SUNPRO -# if !defined(BOOST_COMP_SUNPRO) && defined(__SUNPRO_CC) -# define BOOST_COMP_SUNPRO BOOST_PREDEF_MAKE_0X_VRP(__SUNPRO_CC) +# if !defined(BOOST_COMP_SUNPRO_DETECTION) && defined(__SUNPRO_CC) +# define BOOST_COMP_SUNPRO_DETECTION BOOST_PREDEF_MAKE_0X_VRP(__SUNPRO_CC) # endif -# if !defined(BOOST_COMP_SUNPRO) && defined(__SUNPRO_C) -# define BOOST_COMP_SUNPRO BOOST_PREDEF_MAKE_0X_VRP(__SUNPRO_C) +# if !defined(BOOST_COMP_SUNPRO_DETECTION) && defined(__SUNPRO_C) +# define BOOST_COMP_SUNPRO_DETECTION BOOST_PREDEF_MAKE_0X_VRP(__SUNPRO_C) # endif -# if !defined(BOOST_COMP_SUNPRO) -# define BOOST_COMP_SUNPRO BOOST_VERSION_NUMBER_AVAILABLE +# if !defined(BOOST_COMP_SUNPRO_DETECTION) +# define BOOST_COMP_SUNPRO_DETECTION BOOST_VERSION_NUMBER_AVAILABLE # endif #endif -#if BOOST_COMP_SUNPRO +#ifdef BOOST_COMP_SUNPRO_DETECTION +# if defined(BOOST_PREDEF_DETAIL_COMP_DETECTED) +# define BOOST_COMP_SUNPRO_EMULATED BOOST_COMP_SUNPRO_DETECTION +# else +# undef BOOST_COMP_SUNPRO +# define BOOST_COMP_SUNPRO BOOST_COMP_SUNPRO_DETECTION +# endif # define BOOST_COMP_SUNPRO_AVAILABLE +# include #endif #define BOOST_COMP_SUNPRO_NAME "Sun Studio" @@ -52,5 +58,10 @@ Version number available as major, minor, and patch. #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_SUNPRO,BOOST_COMP_SUNPRO_NAME) +#ifdef BOOST_COMP_SUNPRO_EMULATED +#include +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_SUNPRO_EMULATED,BOOST_COMP_SUNPRO_NAME) +#endif + #endif diff --git a/include/boost/predef/compiler/tendra.h b/include/boost/predef/compiler/tendra.h index 79b2cdc..194f0af 100644 --- a/include/boost/predef/compiler/tendra.h +++ b/include/boost/predef/compiler/tendra.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2014 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -26,12 +26,18 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_COMP_TENDRA BOOST_VERSION_NUMBER_NOT_AVAILABLE #if defined(__TenDRA__) -# undef BOOST_COMP_TENDRA -# define BOOST_COMP_TENDRA BOOST_VERSION_NUMBER_AVAILABLE +# define BOOST_COMP_TENDRA_DETECTION BOOST_VERSION_NUMBER_AVAILABLE #endif -#if BOOST_COMP_TENDRA +#ifdef BOOST_COMP_TENDRA_DETECTION +# if defined(BOOST_PREDEF_DETAIL_COMP_DETECTED) +# define BOOST_COMP_TENDRA_EMULATED BOOST_COMP_TENDRA_DETECTION +# else +# undef BOOST_COMP_TENDRA +# define BOOST_COMP_TENDRA BOOST_COMP_TENDRA_DETECTION +# endif # define BOOST_COMP_TENDRA_AVAILABLE +# include #endif #define BOOST_COMP_TENDRA_NAME "TenDRA C/C++" @@ -39,5 +45,10 @@ http://www.boost.org/LICENSE_1_0.txt) #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_TENDRA,BOOST_COMP_TENDRA_NAME) +#ifdef BOOST_COMP_TENDRA_EMULATED +#include +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_TENDRA_EMULATED,BOOST_COMP_TENDRA_NAME) +#endif + #endif diff --git a/include/boost/predef/compiler/visualc.h b/include/boost/predef/compiler/visualc.h index eb46681..66d0601 100644 --- a/include/boost/predef/compiler/visualc.h +++ b/include/boost/predef/compiler/visualc.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2014 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -8,6 +8,10 @@ http://www.boost.org/LICENSE_1_0.txt) #ifndef BOOST_PREDEF_COMPILER_VISUALC_H #define BOOST_PREDEF_COMPILER_VISUALC_H +/* Other compilers that emulate this one need to be detected first. */ + +#include + #include #include @@ -30,7 +34,6 @@ Version number available as major, minor, and patch. #define BOOST_COMP_MSVC BOOST_VERSION_NUMBER_NOT_AVAILABLE #if defined(_MSC_VER) -# undef BOOST_COMP_MSVC # if !defined (_MSC_FULL_VER) # define BOOST_COMP_MSVC_BUILD 0 # else @@ -45,14 +48,21 @@ Version number available as major, minor, and patch. # error "Cannot determine build number from _MSC_FULL_VER" # endif # endif -# define BOOST_COMP_MSVC BOOST_VERSION_NUMBER(\ +# define BOOST_COMP_MSVC_DETECTION BOOST_VERSION_NUMBER(\ _MSC_VER/100-6,\ _MSC_VER%100,\ BOOST_COMP_MSVC_BUILD) #endif -#if BOOST_COMP_MSVC +#ifdef BOOST_COMP_MSVC_DETECTION +# if defined(BOOST_PREDEF_DETAIL_COMP_DETECTED) +# define BOOST_COMP_MSVC_EMULATED BOOST_COMP_MSVC_DETECTION +# else +# undef BOOST_COMP_MSVC +# define BOOST_COMP_MSVC BOOST_COMP_MSVC_DETECTION +# endif # define BOOST_COMP_MSVC_AVAILABLE +# include #endif #define BOOST_COMP_MSVC_NAME "Microsoft Visual C/C++" @@ -60,5 +70,10 @@ Version number available as major, minor, and patch. #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_MSVC,BOOST_COMP_MSVC_NAME) +#ifdef BOOST_COMP_MSVC_EMULATED +#include +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_MSVC_EMULATED,BOOST_COMP_MSVC_NAME) +#endif + #endif diff --git a/include/boost/predef/compiler/watcom.h b/include/boost/predef/compiler/watcom.h index 8d937c9..832d10c 100644 --- a/include/boost/predef/compiler/watcom.h +++ b/include/boost/predef/compiler/watcom.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2014 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -29,12 +29,18 @@ Version number available as major, and minor. #define BOOST_COMP_WATCOM BOOST_VERSION_NUMBER_NOT_AVAILABLE #if defined(__WATCOMC__) -# undef BOOST_COMP_WATCOM -# define BOOST_COMP_WATCOM BOOST_PREDEF_MAKE_10_VVRR(__WATCOMC__) +# define BOOST_COMP_WATCOM_DETECTION BOOST_PREDEF_MAKE_10_VVRR(__WATCOMC__) #endif -#if BOOST_COMP_WATCOM +#ifdef BOOST_COMP_WATCOM_DETECTION +# if defined(BOOST_PREDEF_DETAIL_COMP_DETECTED) +# define BOOST_COMP_WATCOM_EMULATED BOOST_COMP_WATCOM_DETECTION +# else +# undef BOOST_COMP_WATCOM +# define BOOST_COMP_WATCOM BOOST_COMP_WATCOM_DETECTION +# endif # define BOOST_COMP_WATCOM_AVAILABLE +# include #endif #define BOOST_COMP_WATCOM_NAME "Watcom C++" @@ -42,5 +48,10 @@ Version number available as major, and minor. #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_WATCOM,BOOST_COMP_WATCOM_NAME) +#ifdef BOOST_COMP_WATCOM_EMULATED +#include +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_WATCOM_EMULATED,BOOST_COMP_WATCOM_NAME) +#endif + #endif diff --git a/include/boost/predef/detail/comp_detected.h b/include/boost/predef/detail/comp_detected.h new file mode 100644 index 0000000..fda1801 --- /dev/null +++ b/include/boost/predef/detail/comp_detected.h @@ -0,0 +1,10 @@ +/* +Copyright Rene Rivera 2014 +Distributed under the Boost Software License, Version 1.0. +(See accompanying file LICENSE_1_0.txt or copy at +http://www.boost.org/LICENSE_1_0.txt) +*/ + +#ifndef BOOST_PREDEF_DETAIL_COMP_DETECTED +#define BOOST_PREDEF_DETAIL_COMP_DETECTED 1 +#endif From 17207edcfa33bade293b61cf3ad5df5b192b3101 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 21 Jan 2014 18:56:53 -0600 Subject: [PATCH 07/23] Add exclusive+emjulated behaviour and definitions for platform detection. --- .../boost/predef/detail/platform_detected.h | 10 +++++++ include/boost/predef/platform/mingw.h | 27 +++++++++++++------ 2 files changed, 29 insertions(+), 8 deletions(-) create mode 100644 include/boost/predef/detail/platform_detected.h diff --git a/include/boost/predef/detail/platform_detected.h b/include/boost/predef/detail/platform_detected.h new file mode 100644 index 0000000..4faf693 --- /dev/null +++ b/include/boost/predef/detail/platform_detected.h @@ -0,0 +1,10 @@ +/* +Copyright Rene Rivera 2014 +Distributed under the Boost Software License, Version 1.0. +(See accompanying file LICENSE_1_0.txt or copy at +http://www.boost.org/LICENSE_1_0.txt) +*/ + +#ifndef BOOST_PREDEF_DETAIL_PLAT_DETECTED +#define BOOST_PREDEF_DETAIL_PLAT_DETECTED 1 +#endif diff --git a/include/boost/predef/platform/mingw.h b/include/boost/predef/platform/mingw.h index f48e4c9..6c8d873 100644 --- a/include/boost/predef/platform/mingw.h +++ b/include/boost/predef/platform/mingw.h @@ -32,22 +32,28 @@ Version number available as major, minor, and patch. #if defined(__MINGW32__) || defined(__MINGW64__) # include <_mingw.h> -# undef BOOST_PLAT_MINGW -# if !defined(BOOST_PLAT_MINGW) && (defined(__MINGW64_VERSION_MAJOR) && defined(__MINGW64_VERSION_MINOR)) -# define BOOST_PLAT_MINGW \ +# if !defined(BOOST_PLAT_MINGW_DETECTION) && (defined(__MINGW64_VERSION_MAJOR) && defined(__MINGW64_VERSION_MINOR)) +# define BOOST_PLAT_MINGW_DETECTION \ BOOST_VERSION_NUMBER(__MINGW64_VERSION_MAJOR,__MINGW64_VERSION_MINOR,0) # endif -# if !defined(BOOST_PLAT_MINGW) && (defined(__MINGW32_VERSION_MAJOR) && defined(__MINGW32_VERSION_MINOR)) -# define BOOST_PLAT_MINGW \ +# if !defined(BOOST_PLAT_MINGW_DETECTION) && (defined(__MINGW32_VERSION_MAJOR) && defined(__MINGW32_VERSION_MINOR)) +# define BOOST_PLAT_MINGW_DETECTION \ BOOST_VERSION_NUMBER(__MINGW32_MAJOR_VERSION,__MINGW32_MINOR_VERSION,0) # endif -# if !defined(BOOST_PLAT_MINGW) -# define BOOST_PLAT_MINGW BOOST_VERSION_NUMBER_AVAILABLE +# if !defined(BOOST_PLAT_MINGW_DETECTION) +# define BOOST_PLAT_MINGW_DETECTION BOOST_VERSION_NUMBER_AVAILABLE # endif #endif -#if BOOST_PLAT_MINGW +#ifdef BOOST_PLAT_MINGW_DETECTION # define BOOST_PLAT_MINGW_AVAILABLE +# if defined(BOOST_PREDEF_DETAIL_PLAT_DETECTED) +# define BOOST_PLAT_MINGW_EMULATED BOOST_PLAT_MINGW_DETECTION +# else +# undef BOOST_PLAT_MINGW +# define BOOST_PLAT_MINGW BOOST_PLAT_MINGW_DETECTION +# endif +# include #endif #define BOOST_PLAT_MINGW_NAME "MinGW" @@ -55,5 +61,10 @@ Version number available as major, minor, and patch. #include BOOST_PREDEF_DECLARE_TEST(BOOST_PLAT_MINGW,BOOST_PLAT_MINGW_NAME) +#ifdef BOOST_PLAT_MINGW_EMULATED +#include +BOOST_PREDEF_DECLARE_TEST(BOOST_PLAT_MINGW_EMULATED,BOOST_PLAT_MINGW_NAME) +#endif + #endif From be45c6f54fc22d09937d000819e8943dbd884e59 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 8 Feb 2014 20:46:10 -0600 Subject: [PATCH 08/23] Fix extra "&&" conditional. Thanks to Adam Wulkiewicz for finding the error. --- include/boost/predef/architecture/sparc.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/boost/predef/architecture/sparc.h b/include/boost/predef/architecture/sparc.h index fc0af62..9c91cda 100644 --- a/include/boost/predef/architecture/sparc.h +++ b/include/boost/predef/architecture/sparc.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2014 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -34,10 +34,10 @@ http://www.boost.org/LICENSE_1_0.txt) # if !defined(BOOST_ARCH_SPARC) && defined(__sparcv9) # define BOOST_ARCH_SPARC BOOST_VERSION_NUMBER(9,0,0) # endif -# if !defined(BOOST_ARCH_SPARC) && defined(__sparcv8) +# if !defined(BOOST_ARCH_SPARC) && defined(__sparcv8) # define BOOST_ARCH_SPARC BOOST_VERSION_NUMBER(8,0,0) # endif -# if !defined(BOOST_ARCH_SPARC) && +# if !defined(BOOST_ARCH_SPARC) # define BOOST_ARCH_SPARC BOOST_VERSION_NUMBER_AVAILABLE # endif #endif From a4bf99ec4a70840597f80d13e89a62030e70741f Mon Sep 17 00:00:00 2001 From: Adam Wulkiewicz Date: Tue, 11 Feb 2014 15:09:55 +0100 Subject: [PATCH 09/23] Added alternative checks for endianess detection Currently used checks doesn't work on GCC+Solaris+SPARC. --- include/boost/predef/other/endian.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/boost/predef/other/endian.h b/include/boost/predef/other/endian.h index 88f20e0..fd73364 100644 --- a/include/boost/predef/other/endian.h +++ b/include/boost/predef/other/endian.h @@ -103,6 +103,7 @@ information and acquired knowledge: #if !BOOST_ENDIAN_BIG_BYTE && !BOOST_ENDIAN_BIG_WORD && \ !BOOST_ENDIAN_LITTLE_BYTE && !BOOST_ENDIAN_LITTLE_WORD # if (defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__)) || \ + (defined(_BIG_ENDIAN) && !defined(_LITTLE_ENDIAN)) || \ defined(__ARMEB__) || \ defined(__THUMBEB__) || \ defined(__AARCH64EB__) || \ @@ -119,6 +120,7 @@ information and acquired knowledge: #if !BOOST_ENDIAN_BIG_BYTE && !BOOST_ENDIAN_BIG_WORD && \ !BOOST_ENDIAN_LITTLE_BYTE && !BOOST_ENDIAN_LITTLE_WORD # if (defined(__LITTLE_ENDIAN__) && !defined(__BIG_ENDIAN__)) || \ + (defined(_LITTLE_ENDIAN) && !defined(_BIG_ENDIAN)) || \ defined(__ARMEL__) || \ defined(__THUMBEL__) || \ defined(__AARCH64EL__) || \ @@ -138,6 +140,7 @@ information and acquired knowledge: # include # if BOOST_ARCH_M68K || \ BOOST_ARCH_PARISK || \ + BOOST_ARCH_SPARC || \ BOOST_ARCH_SYS370 || \ BOOST_ARCH_SYS390 || \ BOOST_ARCH_Z From ba7668860c5920f443c1f0a8aeabb6538b1d6b91 Mon Sep 17 00:00:00 2001 From: Franz Detro Date: Tue, 25 Feb 2014 17:08:06 +0100 Subject: [PATCH 10/23] created a copy of macos.h as basis for ios.h --- include/boost/predef/os/ios.h | 58 +++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 include/boost/predef/os/ios.h diff --git a/include/boost/predef/os/ios.h b/include/boost/predef/os/ios.h new file mode 100644 index 0000000..f71ddfb --- /dev/null +++ b/include/boost/predef/os/ios.h @@ -0,0 +1,58 @@ +/* +Copyright Rene Rivera 2008-2013 +Distributed under the Boost Software License, Version 1.0. +(See accompanying file LICENSE_1_0.txt or copy at +http://www.boost.org/LICENSE_1_0.txt) +*/ + +#ifndef BOOST_PREDEF_OS_MACOS_H +#define BOOST_PREDEF_OS_MACOS_H + +#include +#include + +/*` +[heading `BOOST_OS_MACOS`] + +[@http://en.wikipedia.org/wiki/Mac_OS Mac OS] operating system. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[`macintosh`] [__predef_detection__]] + [[`Macintosh`] [__predef_detection__]] + [[`__APPLE__`] [__predef_detection__]] + [[`__MACH__`] [__predef_detection__]] + + [[`__APPLE__`, `__MACH__`] [10.0.0]] + [[ /otherwise/ ] [9.0.0]] + ] + */ + +#define BOOST_OS_MACOS BOOST_VERSION_NUMBER_NOT_AVAILABLE + +#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ + defined(macintosh) || defined(Macintosh) || \ + (defined(__APPLE__) && defined(__MACH__)) \ + ) +# undef BOOST_OS_MACOS +# if !defined(BOOST_OS_MACOS) && defined(__APPLE__) && defined(__MACH__) +# define BOOST_OS_MACOS BOOST_VERSION_NUMBER(10,0,0) +# endif +# if !defined(BOOST_OS_MACOS) +# define BOOST_OS_MACOS BOOST_VERSION_NUMBER(9,0,0) +# endif +#endif + +#if BOOST_OS_MACOS +# define BOOST_OS_MACOS_AVAILABLE +# include +#endif + +#define BOOST_OS_MACOS_NAME "Mac OS" + +#include +BOOST_PREDEF_DECLARE_TEST(BOOST_OS_MACOS,BOOST_OS_MACOS_NAME) + + +#endif From e3a435add25b991a54287b6de897cbcf6f1fbb1d Mon Sep 17 00:00:00 2001 From: Franz Detro Date: Wed, 26 Feb 2014 08:59:58 +0100 Subject: [PATCH 11/23] add detection of Apple iOS (BOOST_OS_IOS) --- include/boost/predef/os.h | 1 + include/boost/predef/os/ios.h | 37 +++++++++++++-------------------- include/boost/predef/os/macos.h | 4 +++- 3 files changed, 19 insertions(+), 23 deletions(-) diff --git a/include/boost/predef/os.h b/include/boost/predef/os.h index 3aceb3a..c74192e 100644 --- a/include/boost/predef/os.h +++ b/include/boost/predef/os.h @@ -16,6 +16,7 @@ http://www.boost.org/LICENSE_1_0.txt) #include #include #include +#include #include #include #include diff --git a/include/boost/predef/os/ios.h b/include/boost/predef/os/ios.h index f71ddfb..a62fb49 100644 --- a/include/boost/predef/os/ios.h +++ b/include/boost/predef/os/ios.h @@ -5,54 +5,47 @@ Distributed under the Boost Software License, Version 1.0. http://www.boost.org/LICENSE_1_0.txt) */ -#ifndef BOOST_PREDEF_OS_MACOS_H -#define BOOST_PREDEF_OS_MACOS_H +#ifndef BOOST_PREDEF_OS_IOS_H +#define BOOST_PREDEF_OS_IOS_H #include #include /*` -[heading `BOOST_OS_MACOS`] +[heading `BOOST_OS_IOS`] -[@http://en.wikipedia.org/wiki/Mac_OS Mac OS] operating system. +[@http://en.wikipedia.org/wiki/iOS iOS] operating system. [table [[__predef_symbol__] [__predef_version__]] - [[`macintosh`] [__predef_detection__]] - [[`Macintosh`] [__predef_detection__]] [[`__APPLE__`] [__predef_detection__]] [[`__MACH__`] [__predef_detection__]] + [[`__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__`] [__predef_detection__]] - [[`__APPLE__`, `__MACH__`] [10.0.0]] - [[ /otherwise/ ] [9.0.0]] + [[`__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__`] [__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__*1000]] ] */ -#define BOOST_OS_MACOS BOOST_VERSION_NUMBER_NOT_AVAILABLE +#define BOOST_OS_IOS BOOST_VERSION_NUMBER_NOT_AVAILABLE #if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ - defined(macintosh) || defined(Macintosh) || \ - (defined(__APPLE__) && defined(__MACH__)) \ + defined(__APPLE__) && defined(__MACH__) && \ + defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__) \ ) -# 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 +# undef BOOST_OS_IOS +# define BOOST_OS_IOS (__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__*1000) #endif -#if BOOST_OS_MACOS -# define BOOST_OS_MACOS_AVAILABLE +#if BOOST_OS_IOS +# define BOOST_OS_IOS_AVAILABLE # include #endif -#define BOOST_OS_MACOS_NAME "Mac OS" +#define BOOST_OS_IOS_NAME "iOS" #include -BOOST_PREDEF_DECLARE_TEST(BOOST_OS_MACOS,BOOST_OS_MACOS_NAME) +BOOST_PREDEF_DECLARE_TEST(BOOST_OS_IOS,BOOST_OS_IOS_NAME) #endif diff --git a/include/boost/predef/os/macos.h b/include/boost/predef/os/macos.h index f71ddfb..1d34ece 100644 --- a/include/boost/predef/os/macos.h +++ b/include/boost/predef/os/macos.h @@ -23,6 +23,7 @@ http://www.boost.org/LICENSE_1_0.txt) [[`Macintosh`] [__predef_detection__]] [[`__APPLE__`] [__predef_detection__]] [[`__MACH__`] [__predef_detection__]] + [[`!__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__`] [__predef_detection__]] [[`__APPLE__`, `__MACH__`] [10.0.0]] [[ /otherwise/ ] [9.0.0]] @@ -31,7 +32,8 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_OS_MACOS BOOST_VERSION_NUMBER_NOT_AVAILABLE -#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ +#if !BOOST_PREDEF_DETAIL_OS_DETECTED && \ + !defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__) && ( \ defined(macintosh) || defined(Macintosh) || \ (defined(__APPLE__) && defined(__MACH__)) \ ) From 2e73899a69c4c706609278168bc49e7ec1227420 Mon Sep 17 00:00:00 2001 From: Franz Detro Date: Wed, 26 Feb 2014 12:23:34 +0100 Subject: [PATCH 12/23] improved detection of ARM platform (check for Apple clang __arm64); set version to 8.0.0 in case of __arm64 (allows check for armv8 targets) --- include/boost/predef/architecture/arm.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/include/boost/predef/architecture/arm.h b/include/boost/predef/architecture/arm.h index 4c469a5..ea3b512 100644 --- a/include/boost/predef/architecture/arm.h +++ b/include/boost/predef/architecture/arm.h @@ -20,10 +20,12 @@ http://www.boost.org/LICENSE_1_0.txt) [[__predef_symbol__] [__predef_version__]] [[`__arm__`] [__predef_detection__]] + [[`__arm64`] [__predef_detection__]] [[`__thumb__`] [__predef_detection__]] [[`__TARGET_ARCH_ARM`] [__predef_detection__]] [[`__TARGET_ARCH_THUMB`] [__predef_detection__]] + [[`__arm64`] [8.0.0]] [[`__TARGET_ARCH_ARM`] [V.0.0]] [[`__TARGET_ARCH_THUMB`] [V.0.0]] ] @@ -31,9 +33,12 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_ARCH_ARM BOOST_VERSION_NUMBER_NOT_AVAILABLE -#if defined(__arm__) || defined(__thumb__) || \ +#if defined(__arm__) || defined(__arm64) || defined(__thumb__) || \ defined(__TARGET_ARCH_ARM) || defined(__TARGET_ARCH_THUMB) # undef BOOST_ARCH_ARM +# if !defined(BOOST_ARCH_ARM) && defined(__arm64) +# define BOOST_ARCH_ARM BOOST_VERSION_NUMBER(8,0,0) +# endif # if !defined(BOOST_ARCH_ARM) && defined(__TARGET_ARCH_ARM) # define BOOST_ARCH_ARM BOOST_VERSION_NUMBER(__TARGET_ARCH_ARM,0,0) # endif From 604f0d35b7da123a52fab91a0c7545656556bf9a Mon Sep 17 00:00:00 2001 From: Franz Detro Date: Wed, 12 Mar 2014 14:05:14 +0100 Subject: [PATCH 13/23] adjusted copyrights as requested by review --- include/boost/predef/architecture/arm.h | 1 + include/boost/predef/os.h | 1 + include/boost/predef/os/ios.h | 2 +- include/boost/predef/os/macos.h | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/include/boost/predef/architecture/arm.h b/include/boost/predef/architecture/arm.h index ea3b512..7f84111 100644 --- a/include/boost/predef/architecture/arm.h +++ b/include/boost/predef/architecture/arm.h @@ -1,5 +1,6 @@ /* Copyright Rene Rivera 2008-2013 +Copyright Franz Detro 2014 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/os.h b/include/boost/predef/os.h index c74192e..628eb4f 100644 --- a/include/boost/predef/os.h +++ b/include/boost/predef/os.h @@ -1,5 +1,6 @@ /* Copyright Rene Rivera 2008-2012 +Copyright Franz Detro 2014 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/os/ios.h b/include/boost/predef/os/ios.h index a62fb49..97e1bb8 100644 --- a/include/boost/predef/os/ios.h +++ b/include/boost/predef/os/ios.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Franz Detro 2014 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/os/macos.h b/include/boost/predef/os/macos.h index 1d34ece..0ace2f5 100644 --- a/include/boost/predef/os/macos.h +++ b/include/boost/predef/os/macos.h @@ -1,5 +1,6 @@ /* Copyright Rene Rivera 2008-2013 +Franz Detro 2014 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) From 96ce033128f252d1dc6918c733675d983545c2de Mon Sep 17 00:00:00 2001 From: Franz Detro Date: Wed, 12 Mar 2014 14:06:17 +0100 Subject: [PATCH 14/23] changed MacOS vs. iOS detection to match policies of library --- include/boost/predef/os/macos.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/include/boost/predef/os/macos.h b/include/boost/predef/os/macos.h index 0ace2f5..aa9a92c 100644 --- a/include/boost/predef/os/macos.h +++ b/include/boost/predef/os/macos.h @@ -9,6 +9,13 @@ http://www.boost.org/LICENSE_1_0.txt) #ifndef BOOST_PREDEF_OS_MACOS_H #define BOOST_PREDEF_OS_MACOS_H +/* Special case: iOS will define the same predefs as MacOS, and additionally + '__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__'. We can guard against that, + but only if we detect iOS first. Hence we will force include iOS detection + * before doing any MacOS detection. + */ +#include + #include #include @@ -24,7 +31,6 @@ http://www.boost.org/LICENSE_1_0.txt) [[`Macintosh`] [__predef_detection__]] [[`__APPLE__`] [__predef_detection__]] [[`__MACH__`] [__predef_detection__]] - [[`!__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__`] [__predef_detection__]] [[`__APPLE__`, `__MACH__`] [10.0.0]] [[ /otherwise/ ] [9.0.0]] @@ -33,8 +39,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_OS_MACOS BOOST_VERSION_NUMBER_NOT_AVAILABLE -#if !BOOST_PREDEF_DETAIL_OS_DETECTED && \ - !defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__) && ( \ +#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ defined(macintosh) || defined(Macintosh) || \ (defined(__APPLE__) && defined(__MACH__)) \ ) From 9e5f79735cd65cb429cf2f6c2d16cb74d14ad185 Mon Sep 17 00:00:00 2001 From: Franz Detro Date: Wed, 12 Mar 2014 14:09:22 +0100 Subject: [PATCH 15/23] added missing 'Copyright' --- include/boost/predef/os/macos.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/boost/predef/os/macos.h b/include/boost/predef/os/macos.h index aa9a92c..9fd8d2a 100644 --- a/include/boost/predef/os/macos.h +++ b/include/boost/predef/os/macos.h @@ -1,6 +1,6 @@ /* Copyright Rene Rivera 2008-2013 -Franz Detro 2014 +Copyright Franz Detro 2014 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) From f94637d9f4c497a773a8cc229ae3bb1227ad4a03 Mon Sep 17 00:00:00 2001 From: Steve Gates Date: Thu, 22 May 2014 11:34:02 -0700 Subject: [PATCH 16/23] Adding checking for _M_ARM macro for Windows. Incorporating feedback from Rene Rivera: Updated the Microsoft copyright to include the year. Made sure ARM predef uses version property with V.0.0. --- include/boost/predef/architecture/arm.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/include/boost/predef/architecture/arm.h b/include/boost/predef/architecture/arm.h index 7f84111..589b14d 100644 --- a/include/boost/predef/architecture/arm.h +++ b/include/boost/predef/architecture/arm.h @@ -1,6 +1,7 @@ /* Copyright Rene Rivera 2008-2013 Copyright Franz Detro 2014 +Copyright (c) Microsoft Corporation 2014 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -25,17 +26,20 @@ http://www.boost.org/LICENSE_1_0.txt) [[`__thumb__`] [__predef_detection__]] [[`__TARGET_ARCH_ARM`] [__predef_detection__]] [[`__TARGET_ARCH_THUMB`] [__predef_detection__]] + [[`_M_ARM'] [__predef_detection__]] [[`__arm64`] [8.0.0]] [[`__TARGET_ARCH_ARM`] [V.0.0]] [[`__TARGET_ARCH_THUMB`] [V.0.0]] + [[`_M_ARM`] [V.0.0]] ] */ #define BOOST_ARCH_ARM BOOST_VERSION_NUMBER_NOT_AVAILABLE #if defined(__arm__) || defined(__arm64) || defined(__thumb__) || \ - defined(__TARGET_ARCH_ARM) || defined(__TARGET_ARCH_THUMB) + defined(__TARGET_ARCH_ARM) || defined(__TARGET_ARCH_THUMB) || \ + defined(_M_ARM) # undef BOOST_ARCH_ARM # if !defined(BOOST_ARCH_ARM) && defined(__arm64) # define BOOST_ARCH_ARM BOOST_VERSION_NUMBER(8,0,0) @@ -46,6 +50,9 @@ http://www.boost.org/LICENSE_1_0.txt) # if !defined(BOOST_ARCH_ARM) && defined(__TARGET_ARCH_THUMB) # define BOOST_ARCH_ARM BOOST_VERSION_NUMBER(__TARGET_ARCH_THUMB,0,0) # endif +# if !defined(BOOST_ARCH_ARM) && defined(_M_ARM) +# define BOOST_ARCH_ARM BOOST_VERSION_NUMBER(_M_ARM,0,0) +# endif # if !defined(BOOST_ARCH_ARM) # define BOOST_ARCH_ARM BOOST_VERSION_NUMBER_AVAILABLE # endif From e3e923f6faafbd367b93f6e6e184f633771644e1 Mon Sep 17 00:00:00 2001 From: Steve Gates Date: Thu, 22 May 2014 16:49:54 -0700 Subject: [PATCH 17/23] Addressing feedback from Rene Rivera for adding BOOST macros for detecting the Windows Runtime being targeted. Now there are new predefs for desktop, store, phone, and the Windows Runtime (store/phone) in general. These can easily be used throughout Boost to detect the Windows platform being targeted. --- include/boost/predef/platform.h | 5 +++ .../boost/predef/platform/windows_desktop.h | 42 +++++++++++++++++++ include/boost/predef/platform/windows_phone.h | 41 ++++++++++++++++++ .../boost/predef/platform/windows_runtime.h | 42 +++++++++++++++++++ include/boost/predef/platform/windows_store.h | 41 ++++++++++++++++++ 5 files changed, 171 insertions(+) create mode 100644 include/boost/predef/platform/windows_desktop.h create mode 100644 include/boost/predef/platform/windows_phone.h create mode 100644 include/boost/predef/platform/windows_runtime.h create mode 100644 include/boost/predef/platform/windows_store.h diff --git a/include/boost/predef/platform.h b/include/boost/predef/platform.h index b2f8825..468a90d 100644 --- a/include/boost/predef/platform.h +++ b/include/boost/predef/platform.h @@ -1,5 +1,6 @@ /* Copyright Rene Rivera 2013 +Copyright (c) Microsoft Corporation 2014 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -9,6 +10,10 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_PREDEF_PLATFORM_H #include +#include +#include +#include +#include /*#include */ #endif diff --git a/include/boost/predef/platform/windows_desktop.h b/include/boost/predef/platform/windows_desktop.h new file mode 100644 index 0000000..bddfb1f --- /dev/null +++ b/include/boost/predef/platform/windows_desktop.h @@ -0,0 +1,42 @@ +/* +Copyright (c) Microsoft Corporation 2014 +Distributed under the Boost Software License, Version 1.0. +(See accompanying file LICENSE_1_0.txt or copy at +http://www.boost.org/LICENSE_1_0.txt) +*/ + +#ifndef BOOST_PREDEF_PLAT_WINDOWS_DESKTOP_H +#define BOOST_PREDEF_PLAT_WINDOWS_DESKTOP_H + +#include +#include + +/*` +[heading `BOOST_PLAT_WINDOWS_DESKTOP`] + +[table + [[__predef_symbol__] [__predef_version__]] + + [[`!WINAPI_FAMILY`] [__predef_detection__]] + [[`WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP`] [__predef_detection__]] + ] + */ + +#define BOOST_PLAT_WINDOWS_DESKTOP BOOST_VERSION_NUMBER_NOT_AVAILABLE + +#if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP) +# undef BOOST_PLAT_WINDOWS_DESKTOP +# define BOOST_PLAT_WINDOWS_DESKTOP BOOST_VERSION_NUMBER_AVAILABLE +#endif + +#ifdef BOOST_PLAT_WINDOWS_DESKTOP +# define BOOST_PLAT_WINDOWS_DESKTOP_AVALIABLE +# include +#endif + +#define BOOST_PLAT_WINDOWS_DESKTOP_NAME "Windows Desktop" + +#include +BOOST_PREDEF_DECLARE_TEST(BOOST_PLAT_WINDOWS_DESKTOP,BOOST_PLAT_WINDOWS_DESKTOP_NAME) + +#endif \ No newline at end of file diff --git a/include/boost/predef/platform/windows_phone.h b/include/boost/predef/platform/windows_phone.h new file mode 100644 index 0000000..a47bcda --- /dev/null +++ b/include/boost/predef/platform/windows_phone.h @@ -0,0 +1,41 @@ +/* +Copyright (c) Microsoft Corporation 2014 +Distributed under the Boost Software License, Version 1.0. +(See accompanying file LICENSE_1_0.txt or copy at +http://www.boost.org/LICENSE_1_0.txt) +*/ + +#ifndef BOOST_PREDEF_PLAT_WINDOWS_PHONE_H +#define BOOST_PREDEF_PLAT_WINDOWS_PHONE_H + +#include +#include + +/*` +[heading `BOOST_PLAT_WINDOWS_PHONE`] + +[table + [[__predef_symbol__] [__predef_version__]] + + [[`WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP`] [__predef_detection__]] + ] + */ + +#define BOOST_PLAT_WINDOWS_PHONE BOOST_VERSION_NUMBER_NOT_AVAILABLE + +#if WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP +# undef BOOST_PLAT_WINDOWS_PHONE +# define BOOST_PLAT_WINDOWS_PHONE BOOST_VERSION_NUMBER_AVAILABLE +#endif + +#ifdef BOOST_PLAT_WINDOWS_PHONE +# define BOOST_PLAT_WINDOWS_PHONE_AVALIABLE +# include +#endif + +#define BOOST_PLAT_WINDOWS_PHONE_NAME "Windows Phone" + +#include +BOOST_PREDEF_DECLARE_TEST(BOOST_PLAT_WINDOWS_PHONE,BOOST_PLAT_WINDOWS_PHONE_NAME) + +#endif \ No newline at end of file diff --git a/include/boost/predef/platform/windows_runtime.h b/include/boost/predef/platform/windows_runtime.h new file mode 100644 index 0000000..d42ffef --- /dev/null +++ b/include/boost/predef/platform/windows_runtime.h @@ -0,0 +1,42 @@ +/* +Copyright (c) Microsoft Corporation 2014 +Distributed under the Boost Software License, Version 1.0. +(See accompanying file LICENSE_1_0.txt or copy at +http://www.boost.org/LICENSE_1_0.txt) +*/ + +#ifndef BOOST_PREDEF_PLAT_WINDOWS_RUNTIME_H +#define BOOST_PREDEF_PLAT_WINDOWS_RUNTIME_H + +#include +#include + +/*` +[heading `BOOST_PLAT_WINDOWS_RUNTIME`] + +[table + [[__predef_symbol__] [__predef_version__]] + + [[`WINAPI_FAMILY == WINAPI_FAMILY_APP`] [__predef_detection__]] + [[`WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP`] [__predef_detection__]] + ] + */ + +#define BOOST_PLAT_WINDOWS_RUNTIME BOOST_VERSION_NUMBER_NOT_AVAILABLE + +#if WINAPI_FAMILY == WINAPI_FAMILY_APP || WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP +# undef BOOST_PLAT_WINDOWS_RUNTIME +# define BOOST_PLAT_WINDOWS_RUNTIME BOOST_VERSION_NUMBER_AVAILABLE +#endif + +#ifdef BOOST_PLAT_WINDOWS_RUNTIME +# define BOOST_PLAT_WINDOWS_RUNTIME_AVALIABLE +# include +#endif + +#define BOOST_PLAT_WINDOWS_RUNTIME_NAME "Windows Runtime" + +#include +BOOST_PREDEF_DECLARE_TEST(BOOST_PLAT_WINDOWS_RUNTIME,BOOST_PLAT_WINDOWS_RUNTIME_NAME) + +#endif \ No newline at end of file diff --git a/include/boost/predef/platform/windows_store.h b/include/boost/predef/platform/windows_store.h new file mode 100644 index 0000000..9f9feea --- /dev/null +++ b/include/boost/predef/platform/windows_store.h @@ -0,0 +1,41 @@ +/* +Copyright (c) Microsoft Corporation 2014 +Distributed under the Boost Software License, Version 1.0. +(See accompanying file LICENSE_1_0.txt or copy at +http://www.boost.org/LICENSE_1_0.txt) +*/ + +#ifndef BOOST_PREDEF_PLAT_WINDOWS_STORE_H +#define BOOST_PREDEF_PLAT_WINDOWS_STORE_H + +#include +#include + +/*` +[heading `BOOST_PLAT_WINDOWS_STORE`] + +[table + [[__predef_symbol__] [__predef_version__]] + + [[`WINAPI_FAMILY == WINAPI_FAMILY_APP`] [__predef_detection__]] + ] + */ + +#define BOOST_PLAT_WINDOWS_STORE BOOST_VERSION_NUMBER_NOT_AVAILABLE + +#if WINAPI_FAMILY == WINAPI_FAMILY_APP +# undef BOOST_PLAT_WINDOWS_STORE +# define BOOST_PLAT_WINDOWS_STORE BOOST_VERSION_NUMBER_AVAILABLE +#endif + +#ifdef BOOST_PLAT_WINDOWS_STORE +# define BOOST_PLAT_WINDOWS_STORE_AVALIABLE +# include +#endif + +#define BOOST_PLAT_WINDOWS_STORE_NAME "Windows Store" + +#include +BOOST_PREDEF_DECLARE_TEST(BOOST_PLAT_WINDOWS_STORE,BOOST_PLAT_WINDOWS_STORE_NAME) + +#endif \ No newline at end of file From d145f3a12cc1e1a988ecd293671dc265a8b72796 Mon Sep 17 00:00:00 2001 From: Steve Gates Date: Thu, 22 May 2014 16:59:37 -0700 Subject: [PATCH 18/23] Adding missing newlines at the end of a few files. --- include/boost/predef/platform/windows_desktop.h | 2 +- include/boost/predef/platform/windows_phone.h | 2 +- include/boost/predef/platform/windows_runtime.h | 2 +- include/boost/predef/platform/windows_store.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/boost/predef/platform/windows_desktop.h b/include/boost/predef/platform/windows_desktop.h index bddfb1f..de5fa87 100644 --- a/include/boost/predef/platform/windows_desktop.h +++ b/include/boost/predef/platform/windows_desktop.h @@ -39,4 +39,4 @@ http://www.boost.org/LICENSE_1_0.txt) #include BOOST_PREDEF_DECLARE_TEST(BOOST_PLAT_WINDOWS_DESKTOP,BOOST_PLAT_WINDOWS_DESKTOP_NAME) -#endif \ No newline at end of file +#endif diff --git a/include/boost/predef/platform/windows_phone.h b/include/boost/predef/platform/windows_phone.h index a47bcda..3e90505 100644 --- a/include/boost/predef/platform/windows_phone.h +++ b/include/boost/predef/platform/windows_phone.h @@ -38,4 +38,4 @@ http://www.boost.org/LICENSE_1_0.txt) #include BOOST_PREDEF_DECLARE_TEST(BOOST_PLAT_WINDOWS_PHONE,BOOST_PLAT_WINDOWS_PHONE_NAME) -#endif \ No newline at end of file +#endif diff --git a/include/boost/predef/platform/windows_runtime.h b/include/boost/predef/platform/windows_runtime.h index d42ffef..e93e4bb 100644 --- a/include/boost/predef/platform/windows_runtime.h +++ b/include/boost/predef/platform/windows_runtime.h @@ -39,4 +39,4 @@ http://www.boost.org/LICENSE_1_0.txt) #include BOOST_PREDEF_DECLARE_TEST(BOOST_PLAT_WINDOWS_RUNTIME,BOOST_PLAT_WINDOWS_RUNTIME_NAME) -#endif \ No newline at end of file +#endif diff --git a/include/boost/predef/platform/windows_store.h b/include/boost/predef/platform/windows_store.h index 9f9feea..e577e37 100644 --- a/include/boost/predef/platform/windows_store.h +++ b/include/boost/predef/platform/windows_store.h @@ -38,4 +38,4 @@ http://www.boost.org/LICENSE_1_0.txt) #include BOOST_PREDEF_DECLARE_TEST(BOOST_PLAT_WINDOWS_STORE,BOOST_PLAT_WINDOWS_STORE_NAME) -#endif \ No newline at end of file +#endif From 0a33d7b27d9a3e783b3062c536355738f3d0632e Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 30 May 2014 13:53:45 -0700 Subject: [PATCH 19/23] Fix BOOST_PLAT_WINDOWS_* defs being defined on non-Windows systems. --- include/boost/predef/platform/windows_desktop.h | 4 +++- include/boost/predef/platform/windows_phone.h | 3 ++- include/boost/predef/platform/windows_runtime.h | 4 +++- include/boost/predef/platform/windows_store.h | 3 ++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/include/boost/predef/platform/windows_desktop.h b/include/boost/predef/platform/windows_desktop.h index de5fa87..9d3a5b0 100644 --- a/include/boost/predef/platform/windows_desktop.h +++ b/include/boost/predef/platform/windows_desktop.h @@ -10,6 +10,7 @@ http://www.boost.org/LICENSE_1_0.txt) #include #include +#include /*` [heading `BOOST_PLAT_WINDOWS_DESKTOP`] @@ -24,7 +25,8 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_PLAT_WINDOWS_DESKTOP BOOST_VERSION_NUMBER_NOT_AVAILABLE -#if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP) +#if BOOST_OS_WINDOWS && \ + ( !defined(WINAPI_FAMILY) || (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP) ) # undef BOOST_PLAT_WINDOWS_DESKTOP # define BOOST_PLAT_WINDOWS_DESKTOP BOOST_VERSION_NUMBER_AVAILABLE #endif diff --git a/include/boost/predef/platform/windows_phone.h b/include/boost/predef/platform/windows_phone.h index 3e90505..90ea5ed 100644 --- a/include/boost/predef/platform/windows_phone.h +++ b/include/boost/predef/platform/windows_phone.h @@ -10,6 +10,7 @@ http://www.boost.org/LICENSE_1_0.txt) #include #include +#include /*` [heading `BOOST_PLAT_WINDOWS_PHONE`] @@ -23,7 +24,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_PLAT_WINDOWS_PHONE BOOST_VERSION_NUMBER_NOT_AVAILABLE -#if WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP +#if BOOST_OS_WINDOWS && WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP # undef BOOST_PLAT_WINDOWS_PHONE # define BOOST_PLAT_WINDOWS_PHONE BOOST_VERSION_NUMBER_AVAILABLE #endif diff --git a/include/boost/predef/platform/windows_runtime.h b/include/boost/predef/platform/windows_runtime.h index e93e4bb..1440fe3 100644 --- a/include/boost/predef/platform/windows_runtime.h +++ b/include/boost/predef/platform/windows_runtime.h @@ -10,6 +10,7 @@ http://www.boost.org/LICENSE_1_0.txt) #include #include +#include /*` [heading `BOOST_PLAT_WINDOWS_RUNTIME`] @@ -24,7 +25,8 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_PLAT_WINDOWS_RUNTIME BOOST_VERSION_NUMBER_NOT_AVAILABLE -#if WINAPI_FAMILY == WINAPI_FAMILY_APP || WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP +#if BOOST_OS_WINDOWS && \ + ( WINAPI_FAMILY == WINAPI_FAMILY_APP || WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP ) # undef BOOST_PLAT_WINDOWS_RUNTIME # define BOOST_PLAT_WINDOWS_RUNTIME BOOST_VERSION_NUMBER_AVAILABLE #endif diff --git a/include/boost/predef/platform/windows_store.h b/include/boost/predef/platform/windows_store.h index e577e37..641c7b9 100644 --- a/include/boost/predef/platform/windows_store.h +++ b/include/boost/predef/platform/windows_store.h @@ -10,6 +10,7 @@ http://www.boost.org/LICENSE_1_0.txt) #include #include +#include /*` [heading `BOOST_PLAT_WINDOWS_STORE`] @@ -23,7 +24,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_PLAT_WINDOWS_STORE BOOST_VERSION_NUMBER_NOT_AVAILABLE -#if WINAPI_FAMILY == WINAPI_FAMILY_APP +#if BOOST_OS_WINDOWS && WINAPI_FAMILY == WINAPI_FAMILY_APP # undef BOOST_PLAT_WINDOWS_STORE # define BOOST_PLAT_WINDOWS_STORE BOOST_VERSION_NUMBER_AVAILABLE #endif From dd59ca4b584ad5715a5c9448b4a456ded2eabbb0 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 30 May 2014 14:04:29 -0700 Subject: [PATCH 20/23] Add platform defs section to docs. --- doc/predef.qbk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/predef.qbk b/doc/predef.qbk index b893305..dcd680b 100644 --- a/doc/predef.qbk +++ b/doc/predef.qbk @@ -443,6 +443,10 @@ and "Y", "M", "D" for dates. [include ../include/boost/predef/os/bsd/*.h] [endsect] +[section `BOOST_PLAT` platform macros] +[include ../include/boost/predef/platform/*.h] +[endsect] + [section Other macros] [include ../include/boost/predef/other/*.h] [endsect] @@ -475,4 +479,4 @@ Edward Diener, Dave Abrahams, Iain Denniston, Dan Price, Ioannis Papadopoulos, and Robert Ramey. And thanks to Joel Falcou for managing the review of this library. -[endsect] \ No newline at end of file +[endsect] From 1e48898a34a79ea4577d949868e455aad118c54a Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 30 May 2014 22:14:44 -0500 Subject: [PATCH 21/23] Update documentation to current basic source state. --- .gitignore | 1 + doc/build.jam | 1 + doc/html/.gitignore | 3 + doc/html/index.html | 12 +- doc/html/predef/acknoledgements.html | 6 +- doc/html/predef/adding_new_predefs.html | 6 +- doc/html/predef/introduction.html | 8 +- doc/html/predef/reference.html | 7 +- .../boost_arch_architecture_macros.html | 52 +++- .../reference/boost_comp_compiler_macros.html | 4 +- .../boost_lang_language_standards_ma.html | 4 +- .../reference/boost_lib_library_macros.html | 4 +- .../boost_os_operating_system_macros.html | 113 +++++-- .../reference/boost_plat_platform_macros.html | 276 ++++++++++++++++++ doc/html/predef/reference/other_macros.html | 10 +- .../reference/version_definition_macros.html | 4 +- doc/html/predef/using_the_predefs.html | 6 +- 17 files changed, 461 insertions(+), 56 deletions(-) create mode 100644 doc/html/predef/reference/boost_plat_platform_macros.html diff --git a/.gitignore b/.gitignore index 5e56e04..7553496 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /bin +/boost-build.jam diff --git a/doc/build.jam b/doc/build.jam index bf658ac..3965a08 100644 --- a/doc/build.jam +++ b/doc/build.jam @@ -4,6 +4,7 @@ # http://www.boost.org/LICENSE_1_0.txt) using quickbook ; +using boostbook ; import path ; if ! $(BOOST_ROOT) diff --git a/doc/html/.gitignore b/doc/html/.gitignore index f723e33..98336bd 100644 --- a/doc/html/.gitignore +++ b/doc/html/.gitignore @@ -1 +1,4 @@ /standalone_HTML.manifest +/docutils.css +/minimal.css +/reference.css diff --git a/doc/html/index.html b/doc/html/index.html index 4bf72b6..1b2261b 100644 --- a/doc/html/index.html +++ b/doc/html/index.html @@ -1,10 +1,10 @@ -Predef 1.0 +Predef 1.1 - + @@ -13,12 +13,11 @@

-Predef 1.0

+Predef 1.1

Rene Rivera

-

Copyright © 2005 Rene Rivera

-

Copyright © 2008-2013 Redshift Software Inc

+

Copyright © 2005, 2008-2014 Rene Rivera

Distributed under the Boost Software License, Version 1.0. (See accompanying @@ -41,6 +40,7 @@

BOOST_LANG language standards macros
BOOST_LIB library macros
BOOST_OS operating system macros
+
BOOST_PLAT platform macros
Other macros
Version definition macros
@@ -50,7 +50,7 @@
- +

Last revised: October 15, 2013 at 04:40:06 GMT

Last revised: May 31, 2014 at 03:00:32 GMT
diff --git a/doc/html/predef/acknoledgements.html b/doc/html/predef/acknoledgements.html index e776864..8cfdb86 100644 --- a/doc/html/predef/acknoledgements.html +++ b/doc/html/predef/acknoledgements.html @@ -4,8 +4,8 @@ Acknoledgements - - + + @@ -35,7 +35,7 @@
-
Copyright © 2005 Rene Rivera
Copyright © 2008-2013 Redshift Software Inc

+

Copyright © 2005, 2008-2014 Rene Rivera

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/doc/html/predef/adding_new_predefs.html b/doc/html/predef/adding_new_predefs.html index de2a4bd..b4dfcba 100644 --- a/doc/html/predef/adding_new_predefs.html +++ b/doc/html/predef/adding_new_predefs.html @@ -4,8 +4,8 @@ Adding new predefs - - + + @@ -192,7 +192,7 @@ Documentation about what is detected.
-
Copyright © 2005 Rene Rivera
Copyright © 2008-2013 Redshift Software Inc

+

Copyright © 2005, 2008-2014 Rene Rivera

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/doc/html/predef/introduction.html b/doc/html/predef/introduction.html index c4a1ada..66d3992 100644 --- a/doc/html/predef/introduction.html +++ b/doc/html/predef/introduction.html @@ -4,9 +4,9 @@ Introduction - - - + + + @@ -191,7 +191,7 @@
-
Copyright © 2005 Rene Rivera
Copyright © 2008-2013 Redshift Software Inc

+

Copyright © 2005, 2008-2014 Rene Rivera

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/doc/html/predef/reference.html b/doc/html/predef/reference.html index d21d43b..c526fc5 100644 --- a/doc/html/predef/reference.html +++ b/doc/html/predef/reference.html @@ -4,8 +4,8 @@ Reference - - + + @@ -23,6 +23,7 @@
BOOST_LANG language standards macros
BOOST_LIB library macros
BOOST_OS operating system macros
+
BOOST_PLAT platform macros
Other macros
Version definition macros
@@ -30,7 +31,7 @@
- + + + + + + + + + + + + + + + +
Copyright © 2005 Rene Rivera
Copyright © 2008-2013 Redshift Software Inc

+

Copyright © 2005, 2008-2014 Rene Rivera

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/doc/html/predef/reference/boost_arch_architecture_macros.html b/doc/html/predef/reference/boost_arch_architecture_macros.html index b2d1ec8..c7113c0 100644 --- a/doc/html/predef/reference/boost_arch_architecture_macros.html +++ b/doc/html/predef/reference/boost_arch_architecture_macros.html @@ -4,7 +4,7 @@ BOOST_ARCH architecture macros - + @@ -154,6 +154,18 @@
+

+ __arm64 +

+ 		+

+ detection +

+

__thumb__ @@ -190,6 +202,30 @@

+

+ `_M_ARM' +

+ 		+

+ detection +

+
+

+ __arm64 +

+ 		+

+ 8.0.0 +

+

__TARGET_ARCH_ARM @@ -213,6 +249,18 @@

+

+ _M_ARM +

+ 		+

+ V.0.0 +

+
@@ -2089,7 +2137,7 @@ -
Copyright © 2005 Rene Rivera
Copyright © 2008-2013 Redshift Software Inc

+

Copyright © 2005, 2008-2014 Rene Rivera

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/doc/html/predef/reference/boost_comp_compiler_macros.html b/doc/html/predef/reference/boost_comp_compiler_macros.html index 49599f1..ff59038 100644 --- a/doc/html/predef/reference/boost_comp_compiler_macros.html +++ b/doc/html/predef/reference/boost_comp_compiler_macros.html @@ -4,7 +4,7 @@ BOOST_COMP compiler macros - + @@ -1765,7 +1765,7 @@
-
Copyright © 2005 Rene Rivera
Copyright © 2008-2013 Redshift Software Inc

+

Copyright © 2005, 2008-2014 Rene Rivera

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/doc/html/predef/reference/boost_lang_language_standards_ma.html b/doc/html/predef/reference/boost_lang_language_standards_ma.html index b29429b..de69405 100644 --- a/doc/html/predef/reference/boost_lang_language_standards_ma.html +++ b/doc/html/predef/reference/boost_lang_language_standards_ma.html @@ -4,7 +4,7 @@ BOOST_LANG language standards macros - + @@ -320,7 +320,7 @@
-
Copyright © 2005 Rene Rivera
Copyright © 2008-2013 Redshift Software Inc

+

Copyright © 2005, 2008-2014 Rene Rivera

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/doc/html/predef/reference/boost_lib_library_macros.html b/doc/html/predef/reference/boost_lib_library_macros.html index e1cd8c4..7aecdd8 100644 --- a/doc/html/predef/reference/boost_lib_library_macros.html +++ b/doc/html/predef/reference/boost_lib_library_macros.html @@ -4,7 +4,7 @@ BOOST_LIB library macros - + @@ -882,7 +882,7 @@
-
Copyright © 2005 Rene Rivera
Copyright © 2008-2013 Redshift Software Inc

+

Copyright © 2005, 2008-2014 Rene Rivera

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/doc/html/predef/reference/boost_os_operating_system_macros.html b/doc/html/predef/reference/boost_os_operating_system_macros.html index 2020f9c..efb9400 100644 --- a/doc/html/predef/reference/boost_os_operating_system_macros.html +++ b/doc/html/predef/reference/boost_os_operating_system_macros.html @@ -4,14 +4,14 @@ BOOST_OS operating system macros - + - +
-PrevUpHomeNext +PrevUpHomeNext

@@ -480,6 +480,81 @@

+ BOOST_OS_IOS +
+

+ iOS operating system. +

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

+ Symbol +

+ 		+

+ Version +

+
+

+ __APPLE__ +

+ 		+

+ detection +

+
+

+ __MACH__ +

+ 		+

+ detection +

+
+

+ __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ +

+ 		+

+ detection +

+
+

+ __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ +

+ 		+

+ __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__*1000 +

+
+
+ BOOST_OS_IRIX

@@ -530,7 +605,7 @@

- + BOOST_OS_LINUX

@@ -581,7 +656,7 @@

- + BOOST_OS_MACOS

@@ -681,7 +756,7 @@

- + BOOST_OS_OS400

@@ -719,7 +794,7 @@

- + BOOST_OS_QNX

@@ -796,7 +871,7 @@

- + BOOST_OS_SOLARIS

@@ -848,7 +923,7 @@

- + BOOST_OS_UNIX

@@ -924,7 +999,7 @@

- + BOOST_OS_SVR4

@@ -1000,7 +1075,7 @@

- + BOOST_OS_VMS

@@ -1063,7 +1138,7 @@

- + BOOST_OS_WINDOWS

@@ -1151,7 +1226,7 @@

- + BOOST_OS_BSD_BSDI

@@ -1189,7 +1264,7 @@

- + BOOST_OS_BSD_DRAGONFLY

@@ -1227,7 +1302,7 @@

- + BOOST_OS_BSD_FREE

@@ -1279,7 +1354,7 @@

- + BOOST_OS_BSD_NET

@@ -1391,7 +1466,7 @@

- + BOOST_OS_BSD_OPEN

@@ -1793,7 +1868,7 @@ -
Copyright © 2005 Rene Rivera
Copyright © 2008-2013 Redshift Software Inc

+

Copyright © 2005, 2008-2014 Rene Rivera

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)

@@ -1801,7 +1876,7 @@

-PrevUpHomeNext +PrevUpHomeNext
diff --git a/doc/html/predef/reference/boost_plat_platform_macros.html b/doc/html/predef/reference/boost_plat_platform_macros.html new file mode 100644 index 0000000..e554c77 --- /dev/null +++ b/doc/html/predef/reference/boost_plat_platform_macros.html @@ -0,0 +1,276 @@ + + + +BOOST_PLAT platform macros + + + + + + + + +
+PrevUpHomeNext +
+
+
+
+ + BOOST_PLAT_MINGW +
+

+ MinGW platform. Version + number available as major, minor, and patch. +

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

+ Symbol +

+ 		+

+ Version +

+
+

+ __MINGW32__ +

+ 		+

+ detection +

+
+

+ __MINGW64__ +

+ 		+

+ detection +

+
+

+ __MINGW64_VERSION_MAJOR, + __MINGW64_VERSION_MINOR +

+ 		+

+ V.R.0 +

+
+

+ __MINGW32_VERSION_MAJOR, + __MINGW32_VERSION_MINOR +

+ 		+

+ V.R.0 +

+
+
+ + BOOST_PLAT_WINDOWS_DESKTOP +
+
++++ + + + + + + + + + + + + + + +
+

+ Symbol +

+ 		+

+ Version +

+
+

+ !WINAPI_FAMILY +

+ 		+

+ detection +

+
+

+ WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP +

+ 		+

+ detection +

+
+
+ + BOOST_PLAT_WINDOWS_PHONE +
+
++++ + + + + + + + + +
+

+ Symbol +

+ 		+

+ Version +

+
+

+ WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP +

+ 		+

+ detection +

+
+
+ + BOOST_PLAT_WINDOWS_RUNTIME +
+
++++ + + + + + + + + + + + + + + +
+

+ Symbol +

+ 		+

+ Version +

+
+

+ WINAPI_FAMILY == WINAPI_FAMILY_APP +

+ 		+

+ detection +

+
+

+ WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP +

+ 		+

+ detection +

+
+
+ + BOOST_PLAT_WINDOWS_STORE +
+
++++ + + + + + + + + +
+

+ Symbol +

+ 		+

+ Version +

+
+

+ WINAPI_FAMILY == WINAPI_FAMILY_APP +

+ 		+

+ detection +

+
+
+ + + +
Copyright © 2005, 2008-2014 Rene Rivera

+ 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) +

+
+
+
+PrevUpHomeNext +
+ + diff --git a/doc/html/predef/reference/other_macros.html b/doc/html/predef/reference/other_macros.html index f747249..b1e3f6f 100644 --- a/doc/html/predef/reference/other_macros.html +++ b/doc/html/predef/reference/other_macros.html @@ -4,14 +4,14 @@ Other macros - + - +
-PrevUpHomeNext +PrevUpHomeNext

@@ -70,7 +70,7 @@

-
Copyright © 2005 Rene Rivera
Copyright © 2008-2013 Redshift Software Inc

+

Copyright © 2005, 2008-2014 Rene Rivera

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)

@@ -78,7 +78,7 @@
-PrevUpHomeNext +PrevUpHomeNext
diff --git a/doc/html/predef/reference/version_definition_macros.html b/doc/html/predef/reference/version_definition_macros.html index 3a6a733..9e6e9ac 100644 --- a/doc/html/predef/reference/version_definition_macros.html +++ b/doc/html/predef/reference/version_definition_macros.html @@ -4,7 +4,7 @@ Version definition macros - + @@ -170,7 +170,7 @@
-
Copyright © 2005 Rene Rivera
Copyright © 2008-2013 Redshift Software Inc

+

Copyright © 2005, 2008-2014 Rene Rivera

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/doc/html/predef/using_the_predefs.html b/doc/html/predef/using_the_predefs.html index b07a85c..2eb24c8 100644 --- a/doc/html/predef/using_the_predefs.html +++ b/doc/html/predef/using_the_predefs.html @@ -4,8 +4,8 @@ Using the predefs - - + + @@ -189,7 +189,7 @@
-
Copyright © 2005 Rene Rivera
Copyright © 2008-2013 Redshift Software Inc

+

Copyright © 2005, 2008-2014 Rene Rivera

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)

From c68e9b6b3037c120fcea070cbedbfc5f5733af04 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 2 Jun 2014 22:59:14 -0500 Subject: [PATCH 22/23] Documentation updates.. Add history and tod-do sections. Start adjusting docs for exclusive defs. --- doc/history.qbk | 24 +++++++ doc/html/index.html | 4 +- doc/html/predef/acknoledgements.html | 6 +- doc/html/predef/history.html | 72 +++++++++++++++++++ .../reference/version_definition_macros.html | 6 +- doc/html/predef/to_do.html | 37 ++++++++++ doc/html/predef/using_the_predefs.html | 6 +- doc/predef.qbk | 6 +- doc/todo.qbk | 7 -- test/.gitignore | 2 + 10 files changed, 154 insertions(+), 16 deletions(-) create mode 100644 doc/history.qbk create mode 100644 doc/html/predef/history.html create mode 100644 doc/html/predef/to_do.html create mode 100644 test/.gitignore diff --git a/doc/history.qbk b/doc/history.qbk new file mode 100644 index 0000000..5cd80ac --- /dev/null +++ b/doc/history.qbk @@ -0,0 +1,24 @@ +[/ +Copyright 2014 Rene Rivera +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) +] + +[section History] + +[heading 1.1] + +* Addition of `BOOST_PLAT_*` platform definitions for MinGW and + Windows platform variants. +* Detection of ARM architecture for Windows compilers to target + mobile devices of WIndows 8. +* Improved ARM detection for 64 bit ARM. +* Added detection of iOS an an operating system. +* Improved detection of endianess on some platforms. +* Addition of exclusive plus emulated definitions for platform + and compiler detection. + +[warning The big change for this version is the restructuring of the definitions to avoid duplicate definitions in one category. That is, only one `BOOST_OS_*` variant will be detected (except for sub-categories).] + +[endsect] diff --git a/doc/html/index.html b/doc/html/index.html index 1b2261b..f3af5b2 100644 --- a/doc/html/index.html +++ b/doc/html/index.html @@ -45,12 +45,14 @@
Version definition macros
+
History
+
To Do
Acknoledgements
- +

Last revised: May 31, 2014 at 03:00:32 GMT

Last revised: June 03, 2014 at 03:39:11 GMT
diff --git a/doc/html/predef/acknoledgements.html b/doc/html/predef/acknoledgements.html index 8cfdb86..7573714 100644 --- a/doc/html/predef/acknoledgements.html +++ b/doc/html/predef/acknoledgements.html @@ -6,11 +6,11 @@ - +
-PrevUpHome +PrevUpHome

@@ -43,7 +43,7 @@

-PrevUpHome +PrevUpHome
diff --git a/doc/html/predef/history.html b/doc/html/predef/history.html new file mode 100644 index 0000000..def9e4a --- /dev/null +++ b/doc/html/predef/history.html @@ -0,0 +1,72 @@ + + + +History + + + + + + + + +
+PrevUpHomeNext +
+
+
+

+ + 1.1 +

+
    +
  • + Addition of BOOST_PLAT_* platform definitions for MinGW and Windows + platform variants. +
    • +
  • + Detection of ARM architecture for Windows compilers to target mobile devices + of WIndows 8. +
    • +
  • + Improved ARM detection for 64 bit ARM. +
    • +
  • + Added detection of iOS an an operating system. +
    • +
  • + Improved detection of endianess on some platforms. +
    • +
  • + Addition of exclusive plus emulated definitions for platform and compiler + detection. +
    • +
+
+ + + + + +
[Warning]Warning

+ The big change for this version is the restructuring of the definitions to + avoid duplicate definitions in one category. That is, only one BOOST_OS_* + variant will be detected (except for sub-categories). +

+
+ + + +
Copyright © 2005, 2008-2014 Rene Rivera

+ 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) +

+
+
+
+PrevUpHomeNext +
+ + diff --git a/doc/html/predef/reference/version_definition_macros.html b/doc/html/predef/reference/version_definition_macros.html index 9e6e9ac..c52ae47 100644 --- a/doc/html/predef/reference/version_definition_macros.html +++ b/doc/html/predef/reference/version_definition_macros.html @@ -7,11 +7,11 @@ - +
-PrevUpHomeNext +PrevUpHomeNext

@@ -178,7 +178,7 @@

-PrevUpHomeNext +PrevUpHomeNext
diff --git a/doc/html/predef/to_do.html b/doc/html/predef/to_do.html new file mode 100644 index 0000000..200e3ce --- /dev/null +++ b/doc/html/predef/to_do.html @@ -0,0 +1,37 @@ + + + +To Do + + + + + + + + +
+PrevUpHomeNext +
+
+

+To Do +

+
  • + Improve reference documentation. +
+
+ + + +
Copyright © 2005, 2008-2014 Rene Rivera

+ 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) +

+
+
+
+PrevUpHomeNext +
+ + diff --git a/doc/html/predef/using_the_predefs.html b/doc/html/predef/using_the_predefs.html index 2eb24c8..171d5e4 100644 --- a/doc/html/predef/using_the_predefs.html +++ b/doc/html/predef/using_the_predefs.html @@ -51,6 +51,10 @@ BOOST_OS_ for the operating system we are compiling to. +
  • + BOOST_PLAT_ for platforms + on top of operating system or compilers. +
  • BOOST_ENDIAN_ for endianness of the os and architecture combination. @@ -128,7 +132,7 @@ }

    - In addition, for each version macro defined there is a *_AVAILABLE macro defined only when the particular + In addition, for each version macro defined there is an *_AVAILABLE macro defined only when the particular aspect is detected. I.e. a definition equivalent to: 

    #if BOOST_PREDEF_ABC
diff --git a/doc/predef.qbk b/doc/predef.qbk
index dcd680b..1ff91d3 100644
--- a/doc/predef.qbk
+++ b/doc/predef.qbk
@@ -141,6 +141,7 @@ macros of a particular prefix:
 * `BOOST_LIB_C_` and `BOOST_LIB_STD_` for the C and C++ standard library
   in use.
 * `BOOST_OS_` for the operating system we are compiling to.
+* `BOOST_PLAT_` for platforms on top of operating system or compilers.
 * `BOOST_ENDIAN_` for endianness of the os and architecture combination.
 
 [note The detected definitions are for the configuration one is targeting
@@ -209,7 +210,7 @@ from the preprocessor:
   }
 ``
 
-In addition, for each version macro defined there is a
+In addition, for each version macro defined there is an
 `*_AVAILABLE` macro defined only when the particular aspect is
 detected. I.e. a definition equivalent to:
 
@@ -458,6 +459,9 @@ and "Y", "M", "D" for dates.
 
 [endsect]
 
+[include history.qbk]
+[include todo.qbk]
+
 [section Acknoledgements]
 
 The comprehensiveness of this library would not be
diff --git a/doc/todo.qbk b/doc/todo.qbk
index 375bca5..12f7db5 100644
--- a/doc/todo.qbk
+++ b/doc/todo.qbk
@@ -7,13 +7,6 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 [section To Do]
 
-* Provide "exclusive" defs for compilers, OS, and others, that are exclusively
-  defined for the detected component. Or do we follow what we do with OS detection
-  and keep the various category defs exclusive within the category (i.e. only
-  define one compiler, language, etc). Or is this something specific to the category?
-  Possible exclusive categories: architecture, compiler, platform.
 * Improve reference documentation.
-* Integrate Quickbook multi-include changes to main line Quickbook so that
-  Predef can be included in the global documentation.
 
 [endsect]
diff --git a/test/.gitignore b/test/.gitignore
new file mode 100644
index 0000000..d8feff7
--- /dev/null
+++ b/test/.gitignore
@@ -0,0 +1,2 @@
+/defs-clang.txt
+/defs-gcc.txt

From 56baa26f11d65b36eaf779a1941fc34b55c3c50b Mon Sep 17 00:00:00 2001
From: Rene Rivera 
Date: Tue, 3 Jun 2014 22:29:53 -0500
Subject: [PATCH 23/23] FUlly updated docs for version 1.1.

---
 doc/history.qbk                               |   5 +-
 doc/html/index.html                           |   2 +-
 doc/html/predef/adding_new_predefs.html       | 119 ++++++++++++++++--
 doc/html/predef/history.html                  |   4 +-
 .../boost_arch_architecture_macros.html       |   2 +-
 doc/html/predef/using_the_predefs.html        |  18 +++
 doc/predef.qbk                                | 115 +++++++++++++++--
 include/boost/predef/architecture/arm.h       |   2 +-
 8 files changed, 243 insertions(+), 24 deletions(-)

diff --git a/doc/history.qbk b/doc/history.qbk
index 5cd80ac..b2fb81e 100644
--- a/doc/history.qbk
+++ b/doc/history.qbk
@@ -19,6 +19,9 @@ http://www.boost.org/LICENSE_1_0.txt)
 * Addition of exclusive plus emulated definitions for platform
   and compiler detection.
 
-[warning The big change for this version is the restructuring of the definitions to avoid duplicate definitions in one category. That is, only one `BOOST_OS_*` variant will be detected (except for sub-categories).]
+[warning The big change for this version is the restructuring of the
+definitions to avoid duplicate definitions in one category. That is, only one
+`BOOST_OS_*`, `BOOST_COMP_*`, and `BOOST_PLAT_*` variant will be detected
+(except for sub-categories).]
 
 [endsect]
diff --git a/doc/html/index.html b/doc/html/index.html
index f3af5b2..024453d 100644
--- a/doc/html/index.html
+++ b/doc/html/index.html
@@ -52,7 +52,7 @@
    • - +

    Last revised: June 03, 2014 at 03:39:11 GMT

    Last revised: June 04, 2014 at 03:28:01 GMT
    diff --git a/doc/html/predef/adding_new_predefs.html b/doc/html/predef/adding_new_predefs.html index b4dfcba..091b7b7 100644 --- a/doc/html/predef/adding_new_predefs.html +++ b/doc/html/predef/adding_new_predefs.html @@ -37,20 +37,21 @@ The headers must use the Boost Software License.
  • - The predef must, by default, be defined as BOOST_VERSION_NUMBER(0,0,0). + The predef must, by default, be defined as BOOST_VERSION_NUMBER_NOT_AVAILABLE.
  • The predef must be redefined to a non-zero value once detected.
  • - The predef must, by default, be defined to BOOST_VERSION_NUMBER(0,0,1) when the predef is detected. + The predef must, by default, be defined to BOOST_VERSION_NUMBER_AVAILABLE + when the predef is detected.
  • If possible, the predef will be defined as the version number detected.
  • The predef must define *_AVAILABLE - macros. + macros as needed.
  • The predef must define a symbolic constant string name macro. @@ -58,6 +59,16 @@
  • The predef must declare itself, after being defined, for the testing system.
    • +
  • + The predef must guarantee that it is the only one defined as detected per + category. +
    • +
  • + But a predef can define *_EMULATED macros to indicate that it + was previously detected by another header and is being "emulated" + by the system. Note that the *_AVAILABLE macros must still be defined + in this situation. +

    • And there are some extra guidelines that predef headers should follow: @@ -97,6 +108,12 @@ http://www.boost.org/LICENSE_1_0.txt) #ifndef BOOST_PREDEF_category_tag_H #define BOOST_PREDEF_category_tag_H +

    + If the detection depends on the detection of another predef you should include + those headers here. +

    +
    #include <boost/predef/CATEGORY_TAG/DEPENDENCY.h>
+

    Depending on how you are defining the predef you will at minimum have to include the version_number.h header. But you might also want to include @@ -120,7 +137,7 @@ http://www.boost.org/LICENSE_1_0.txt) Documentation about what is detected. */ -#define BOOST_category_tag BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_category_tag BOOST_VERSION_NUMBER_NOT_AVAILABLE

    Next is the detection and definition of the particular predef. The structure @@ -130,27 +147,29 @@ Documentation about what is detected. BOOST_category_tag" which undefines the zero-value default. The rest is up to the you how to do the checks for defining the version. But at minimum it must "#define - BOOST_category_tag BOOST_VERSION_NUMBER(0,0,1)" as the fallback to minimally indicate - that the predef was detected: + BOOST_category_tag BOOST_VERSION_NUMBER_AVAILABLE" + as the fallback to minimally indicate that the predef was detected: 

    #if (condition_a)
 #   undef BOOST_category_tag
 #   if (condition_b)
 #        define BOOST_category_tag BOOST_VERSION_NUMBER(major,minor,patch)
 #    else
-#        define BOOST_category_tag BOOST_VERSION_NUMBER(0,0,1)
+#        define BOOST_category_tag BOOST_VERSION_NUMBER_AVAILABLE
 #    endif
 #endif

    - We also need to provide the *_AVAILABLE versions of the predef. And for - convenience we also want to provide a *_NAME macro: + We also need to provide the *_AVAILABLE versions of the predef. 

    #if BOOST_category_tag
 #   define BOOST_category_tag_AVAILABLE
 #endif
-
-#define BOOST_catagory_tag_NAME "Name"
+
    +

    + And for convenience we also want to provide a *_NAME macro: +

    +
    #define BOOST_catagory_tag_NAME "Name"

    The testing of the predef macros is automated to generate checks for all the @@ -168,6 +187,84 @@ Documentation about what is detected.

    + Adding + exclusive predefs +

    +

    + For headers of predefs that need to be mutually exclusive in the detection + we need to add checks and definitions to detect when the predef is detected + by multiple headers. +

    +

    + Internally compiler, operating system, and platforms define BOOST_PREDEF_DETAIL_COMP_DETECTED, + BOOST_PREDEF_DEFAIL_OS_DETECTED, + and BOOST_PREDEF_DETAIL_PLAT_DETECTED + respectively when the predef is first detected. This is used to guard against + multiple definition of the detection in later included headers. In those cases + the detection would instead be written as: +

    +
    #if !BOOST_PREDEF_DETAIL_category_DETECTED && (condition_a)
+#   undef BOOST_category_tag
+#   if (condition_b)
+#        define BOOST_category_tag BOOST_VERSION_NUMBER(major,minor,patch)
+#    else
+#        define BOOST_category_tag BOOST_VERSION_NUMBER(0,0,1)
+#    endif
+#endif
+
    +

    + And we also include a header that defines the *_DETECTED macro when we have the detection: +

    +
    #if BOOST_category_tag
+#   define BOOST_category_tag_AVAILABLE
+#   include <boost/predef/detail/CATEGORY_detected.h>
+#endif
+
    +

    + Everything else about the header is the same as the basic detection header. +

    +

    + + Adding + an exclusive but emulated predef +

    +

    + Because compilers are frequently emulated by other compilers we both want to + have exclusive detection of the compiler and also provide information that + we detected the emulation of the compiler. To accomplish this we define a local + *_DETECTION + macro for the compiler detection. And conditionally define either the base + compiler predef BOOST_COMP_compiler + or the alternate BOOST_COMP_compiler_EMULATED + predef. +

    +

    + The initial detection would look like: +

    +
    #if (condition_a)
+#   if (condition_b)
+#        define BOOST_COMP_tag_DETECTION BOOST_VERSION_NUMBER(major,minor,patch)
+#    else
+#        define BOOST_COMP_tag_DETECTION BOOST_VERSION_NUMBER_AVAILABLE
+#    endif
+#endif
+
    +

    + And then we can conditionally define the base or emulated predefs: +

    +
    #ifdef BOOST_COMP_tag_DETECTION
+#   if defined(BOOST_PREDEF_DETAIL_COMP_DETECTED)
+#       define BOOST_COMP_tag_EMULATED BOOST_COMP_tag_DETECTION
+#   else
+#       undef BOOST_COMP_tag
+#       define BOOST_COMP_tag BOOST_COMP_tag_DETECTION
+#   endif
+#   define BOOST_category_tag_AVAILABLE
+#   include <boost/predef/detail/comp_detected.h>
+#endif
+
    +

    + Using utility pattern macros

    diff --git a/doc/html/predef/history.html b/doc/html/predef/history.html index def9e4a..9d9a2ef 100644 --- a/doc/html/predef/history.html +++ b/doc/html/predef/history.html @@ -51,7 +51,9 @@

    The big change for this version is the restructuring of the definitions to - avoid duplicate definitions in one category. That is, only one BOOST_OS_* + avoid duplicate definitions in one category. That is, only one BOOST_OS_*, + BOOST_COMP_*, + and BOOST_PLAT_* variant will be detected (except for sub-categories).

    diff --git a/doc/html/predef/reference/boost_arch_architecture_macros.html b/doc/html/predef/reference/boost_arch_architecture_macros.html index c7113c0..c790a49 100644 --- a/doc/html/predef/reference/boost_arch_architecture_macros.html +++ b/doc/html/predef/reference/boost_arch_architecture_macros.html @@ -204,7 +204,7 @@

    - `_M_ARM' + _M_ARM

    diff --git a/doc/html/predef/using_the_predefs.html b/doc/html/predef/using_the_predefs.html index 171d5e4..7ce9d04 100644 --- a/doc/html/predef/using_the_predefs.html +++ b/doc/html/predef/using_the_predefs.html @@ -145,6 +145,24 @@

    + The + *_EMULATED + macros +

    +

    + Predef definitions are guaranteed to be uniquely detected within one category. + But there are contexts under which multiple underlying detections are possible. + The well known example of this is detection of GCC and MSVC compilers which + are commonly emulated by other compilers by defining the same base macros. + To account for this detection headers are allowed to define *_EMULATED predefs when this situation is + detected. The emulated predefs will be set to the version number of the detection + instead of the regular predef macro for that detection. For example MSVC will + set BOOST_COMP_MSVC_EMULATED + but not set BOOST_COM_MSVC, + and it will also set BOOST_COMP_MSVC_AVAILABLE. +

    +

    + Using the BOOST_VERSION_NUMBER macro

    diff --git a/doc/predef.qbk b/doc/predef.qbk index 1ff91d3..75ec39d 100644 --- a/doc/predef.qbk +++ b/doc/predef.qbk @@ -223,6 +223,17 @@ detected. I.e. a definition equivalent to: Also for each aspect there is a macro defined with a descriptive name of what the detection is. +[heading The `*_EMULATED` macros] + +Predef definitions are guaranteed to be uniquely detected within one category. +But there are contexts under which multiple underlying detections are possible. +The well known example of this is detection of GCC and MSVC compilers which are +commonly emulated by other compilers by defining the same base macros. To +account for this detection headers are allowed to define `*_EMULATED` predefs +when this situation is detected. The emulated predefs will be set to the +version number of the detection instead of the regular predef macro for that +detection. For example MSVC will set `BOOST_COMP_MSVC_EMULATED` but not set `BOOST_COM_MSVC`, and it will also set `BOOST_COMP_MSVC_AVAILABLE`. + [heading Using the `BOOST_VERSION_NUMBER` macro] All the predefs are defined to be a use of the `BOOST_VERSION_NUMBER` macro. @@ -276,15 +287,21 @@ the same structure and requirements. All predefs need to follow a set of requirements: * The headers must use the Boost Software License. -* The predef must, by default, be defined as `BOOST_VERSION_NUMBER(0,0,0)`. +* The predef must, by default, be defined as `BOOST_VERSION_NUMBER_NOT_AVAILABLE`. * The predef must be redefined to a non-zero value once detected. -* The predef must, by default, be defined to `BOOST_VERSION_NUMBER(0,0,1)` +* The predef must, by default, be defined to `BOOST_VERSION_NUMBER_AVAILABLE` when the predef is detected. * If possible, the predef will be defined as the version number detected. -* The predef must define `*_AVAILABLE` macros. +* The predef must define `*_AVAILABLE` macros as needed. * The predef must define a symbolic constant string name macro. * The predef must declare itself, after being defined, for the testing system. +* The predef must guarantee that it is the only one defined as detected + per category. +* But a predef can define `*_EMULATED` macros to indicate that it was + previously detected by another header and is being "emulated" by the + system. Note that the `*_AVAILABLE` macros must still be defined in this + situation. And there are some extra guidelines that predef headers should follow: @@ -315,6 +332,13 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_PREDEF_category_tag_H `` +If the detection depends on the detection of another predef you should +include those headers here. + +`` +#include +`` + Depending on how you are defining the predef you will at minimum have to include the `version_number.h` header. But you might also want to include the `make.h` header for the version number decomposing utility @@ -340,7 +364,7 @@ for the macro. In particular this works for the popular Eclipse IDE: Documentation about what is detected. */ -#define BOOST_category_tag BOOST_VERSION_NUMBER(0,0,0) +#define BOOST_category_tag BOOST_VERSION_NUMBER_NOT_AVAILABLE `` Next is the detection and definition of the particular predef. The @@ -349,7 +373,7 @@ place further version detection inside this. The first action inside the overall check is to "`#undef BOOST_category_tag`" which undefines the zero-value default. The rest is up to the you how to do the checks for defining the version. But at minimum it must -"`#define BOOST_category_tag BOOST_VERSION_NUMBER(0,0,1)`" as the fallback +"`#define BOOST_category_tag BOOST_VERSION_NUMBER_AVAILABLE`" as the fallback to minimally indicate that the predef was detected: `` @@ -358,19 +382,22 @@ to minimally indicate that the predef was detected: # if (condition_b) # define BOOST_category_tag BOOST_VERSION_NUMBER(major,minor,patch) # else -# define BOOST_category_tag BOOST_VERSION_NUMBER(0,0,1) +# define BOOST_category_tag BOOST_VERSION_NUMBER_AVAILABLE # endif #endif `` -We also need to provide the `*_AVAILABLE` versions of the predef. And -for convenience we also want to provide a `*_NAME` macro: +We also need to provide the `*_AVAILABLE` versions of the predef. `` #if BOOST_category_tag # define BOOST_category_tag_AVAILABLE #endif +`` +And for convenience we also want to provide a `*_NAME` macro: + +`` #define BOOST_catagory_tag_NAME "Name" `` @@ -391,6 +418,78 @@ And, of course, we last need to close out the include guard: #endif `` +[heading Adding exclusive predefs] + +For headers of predefs that need to be mutually exclusive in the detection +we need to add checks and definitions to detect when the predef is +detected by multiple headers. + +Internally compiler, operating system, and platforms define +`BOOST_PREDEF_DETAIL_COMP_DETECTED`, `BOOST_PREDEF_DEFAIL_OS_DETECTED`, and +`BOOST_PREDEF_DETAIL_PLAT_DETECTED` respectively when the predef is first +detected. This is used to guard against multiple definition of the detection +in later included headers. In those cases the detection would instead be +written as: + +`` +#if !BOOST_PREDEF_DETAIL_category_DETECTED && (condition_a) +# undef BOOST_category_tag +# if (condition_b) +# define BOOST_category_tag BOOST_VERSION_NUMBER(major,minor,patch) +# else +# define BOOST_category_tag BOOST_VERSION_NUMBER(0,0,1) +# endif +#endif +`` + +And we also include a header that defines the `*_DETECTED` macro when we have +the detection: + +`` +#if BOOST_category_tag +# define BOOST_category_tag_AVAILABLE +# include +#endif +`` + +Everything else about the header is the same as the basic detection header. + +[heading Adding an exclusive but emulated predef] + +Because compilers are frequently emulated by other compilers we both want +to have exclusive detection of the compiler and also provide information +that we detected the emulation of the compiler. To accomplish this we define +a local `*_DETECTION` macro for the compiler detection. And conditionally +define either the base compiler predef `BOOST_COMP_compiler` or the alternate +`BOOST_COMP_compiler_EMULATED` predef. + +The initial detection would look like: + +`` +#if (condition_a) +# if (condition_b) +# define BOOST_COMP_tag_DETECTION BOOST_VERSION_NUMBER(major,minor,patch) +# else +# define BOOST_COMP_tag_DETECTION BOOST_VERSION_NUMBER_AVAILABLE +# endif +#endif +`` + +And then we can conditionally define the base or emulated predefs: + +`` +#ifdef BOOST_COMP_tag_DETECTION +# if defined(BOOST_PREDEF_DETAIL_COMP_DETECTED) +# define BOOST_COMP_tag_EMULATED BOOST_COMP_tag_DETECTION +# else +# undef BOOST_COMP_tag +# define BOOST_COMP_tag BOOST_COMP_tag_DETECTION +# endif +# define BOOST_category_tag_AVAILABLE +# include +#endif +`` + [heading Using utility pattern macros] By including: diff --git a/include/boost/predef/architecture/arm.h b/include/boost/predef/architecture/arm.h index 589b14d..4974895 100644 --- a/include/boost/predef/architecture/arm.h +++ b/include/boost/predef/architecture/arm.h @@ -26,7 +26,7 @@ http://www.boost.org/LICENSE_1_0.txt) [[`__thumb__`] [__predef_detection__]] [[`__TARGET_ARCH_ARM`] [__predef_detection__]] [[`__TARGET_ARCH_THUMB`] [__predef_detection__]] - [[`_M_ARM'] [__predef_detection__]] + [[`_M_ARM`] [__predef_detection__]] [[`__arm64`] [8.0.0]] [[`__TARGET_ARCH_ARM`] [V.0.0]]