Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r75949 - in sandbox/predef: boost/predef boost/predef/compiler boost/predef/library/c boost/predef/library/std boost/predef/os libs/predef/doc libs/predef/doc/html libs/predef/doc/html/predef libs/predef/test
From: grafikrobot_at_[hidden]
Date: 2011-12-14 22:48:43


Author: grafik
Date: 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
New Revision: 75949
URL: http://svn.boost.org/trac/boost/changeset/75949

Log:
Last update, for now, of the predefs. They are all now documented and checked against current knowledge of detection.
Added:
   sandbox/predef/boost/predef/compiler/clang.h (contents, props changed)
   sandbox/predef/boost/predef/os/os400.h (contents, props changed)
   sandbox/predef/boost/predef/os/vms.h (contents, props changed)
Text files modified:
   sandbox/predef/boost/predef/compiler.h | 1
   sandbox/predef/boost/predef/compiler/borland.h | 12 +
   sandbox/predef/boost/predef/compiler/comeau.h | 10 +
   sandbox/predef/boost/predef/compiler/compaq.h | 16 +-
   sandbox/predef/boost/predef/compiler/diab.h | 4
   sandbox/predef/boost/predef/compiler/digitalmars.h | 2
   sandbox/predef/boost/predef/compiler/dignus.h | 4
   sandbox/predef/boost/predef/compiler/edg.h | 6
   sandbox/predef/boost/predef/compiler/ekopath.h | 4
   sandbox/predef/boost/predef/compiler/gcc.h | 4
   sandbox/predef/boost/predef/compiler/greenhills.h | 12 +
   sandbox/predef/boost/predef/compiler/hp_acc.h | 10 +
   sandbox/predef/boost/predef/compiler/iar.h | 4
   sandbox/predef/boost/predef/compiler/ibm.h | 8
   sandbox/predef/boost/predef/compiler/intel.h | 10 +
   sandbox/predef/boost/predef/compiler/kai.h | 4
   sandbox/predef/boost/predef/compiler/llvm.h | 2
   sandbox/predef/boost/predef/compiler/metaware.h | 4
   sandbox/predef/boost/predef/compiler/metrowerks.h | 22 +-
   sandbox/predef/boost/predef/compiler/microtec.h | 4
   sandbox/predef/boost/predef/compiler/mingw.h | 15 +
   sandbox/predef/boost/predef/compiler/mpw.h | 12 +
   sandbox/predef/boost/predef/compiler/palm.h | 4
   sandbox/predef/boost/predef/compiler/pgi.h | 10 +
   sandbox/predef/boost/predef/compiler/sgi_mipspro.h | 10
   sandbox/predef/boost/predef/compiler/sunpro.h | 14 +
   sandbox/predef/boost/predef/compiler/tendra.h | 4
   sandbox/predef/boost/predef/compiler/visualc.h | 2
   sandbox/predef/boost/predef/compiler/watcom.h | 4
   sandbox/predef/boost/predef/library/c/uc.h | 2
   sandbox/predef/boost/predef/library/c/vms.h | 5
   sandbox/predef/boost/predef/library/std/cxx.h | 2
   sandbox/predef/boost/predef/library/std/roguewave.h | 2
   sandbox/predef/boost/predef/library/std/sgi.h | 2
   sandbox/predef/boost/predef/library/std/stlport.h | 2
   sandbox/predef/boost/predef/library/std/vacpp.h | 2
   sandbox/predef/boost/predef/make.h | 36 +++--
   sandbox/predef/boost/predef/os.h | 2
   sandbox/predef/boost/predef/os/aix.h | 6
   sandbox/predef/boost/predef/os/amigaos.h | 2
   sandbox/predef/boost/predef/os/beos.h | 4
   sandbox/predef/boost/predef/os/bsd.h | 21 +-
   sandbox/predef/boost/predef/os/cygwin.h | 2
   sandbox/predef/boost/predef/os/hpux.h | 2
   sandbox/predef/boost/predef/os/irix.h | 4
   sandbox/predef/boost/predef/os/linux.h | 2
   sandbox/predef/boost/predef/os/macos.h | 4
   sandbox/predef/boost/predef/os/qnxnto.h | 4
   sandbox/predef/boost/predef/os/solaris.h | 2
   sandbox/predef/boost/predef/os/unix.h | 19 ++
   sandbox/predef/boost/predef/os/windows.h | 7
   sandbox/predef/libs/predef/doc/html/index.html | 4
   sandbox/predef/libs/predef/doc/html/predef/adding_new_predefs.html | 34 ----
   sandbox/predef/libs/predef/doc/html/predef/introduction.html | 2
   sandbox/predef/libs/predef/doc/html/predef/reference.html | 277 ++++++++++++++++++++++-----------------
   sandbox/predef/libs/predef/doc/html/predef/using_the_predefs.html | 30 ----
   sandbox/predef/libs/predef/doc/predef.qbk | 2
   sandbox/predef/libs/predef/test/make.cpp | 4
   58 files changed, 379 insertions(+), 326 deletions(-)

Modified: sandbox/predef/boost/predef/compiler.h
==============================================================================
--- sandbox/predef/boost/predef/compiler.h (original)
+++ sandbox/predef/boost/predef/compiler.h 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -9,6 +9,7 @@
 #define BOOST_PREDEF_COMPILER_H
 
 #include <boost/predef/compiler/borland.h>
+#include <boost/predef/compiler/clang.h>
 #include <boost/predef/compiler/comeau.h>
 #include <boost/predef/compiler/compaq.h>
 #include <boost/predef/compiler/cygwin.h>

Modified: sandbox/predef/boost/predef/compiler/borland.h
==============================================================================
--- sandbox/predef/boost/predef/compiler/borland.h (original)
+++ sandbox/predef/boost/predef/compiler/borland.h 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -14,18 +14,22 @@
 /*`
 [heading `BOOST_CXX_BORLAND`]
 
-[@http://en.wikipedia.org/wiki/XXX Borland] compiler.
+[@http://en.wikipedia.org/wiki/C_plus_plus_builder Borland C++] compiler.
 Version number available as major, minor, and patch.
  */
 
 #define BOOST_CXX_BORLAND BOOST_VERSION_NUMBER(0,0,0)
 
-#if defined(__BORLANDC__)
+#if defined(__BORLANDC__) || defined(__CODEGEARC__)
     #undef BOOST_CXX_BORLAND
- #define BOOST_CXX_BORLAND BOOST_PREDEF_MAKE_FF_F_F(__BORLANDC__)
+ #if defined(__CODEGEARC__)
+ #define BOOST_CXX_BORLAND BOOST_PREDEF_MAKE_FF_F_F(__CODEGEARC__)
+ #else
+ #define BOOST_CXX_BORLAND BOOST_PREDEF_MAKE_FF_F_F(__BORLANDC__)
+ #endif
 #endif
 
 #include <boost/predef/detail/test.h>
-BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_BORLAND,"Borland")
+BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_BORLAND,"Borland C++")
 
 #endif

Added: sandbox/predef/boost/predef/compiler/clang.h
==============================================================================
--- (empty file)
+++ sandbox/predef/boost/predef/compiler/clang.h 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -0,0 +1,31 @@
+/*
+Copyright Redshift Software, Inc. 2008-2011
+Distributed under the Boost Software License, Version 1.0.
+(See accompanying file LICENSE_1_0.txt or copy at
+http://www.boost.org/LICENSE_1_0.txt)
+*/
+
+#ifndef BOOST_PREDEF_COMPILER_CLANG_H
+#define BOOST_PREDEF_COMPILER_CLANG_H
+
+#include <boost/predef/version_number.h>
+#include <boost/predef/make.h>
+
+/*`
+[heading `BOOST_CXX_CLANG`]
+
+[@http://en.wikipedia.org/wiki/Clang Clang] compiler.
+Version number available as major, minor, and patch.
+ */
+
+#define BOOST_CXX_CLANG BOOST_VERSION_NUMBER(0,0,0)
+
+#if defined(__clang__)
+ #undef BOOST_CXX_CLANG
+ #define BOOST_CXX_CLANG BOOST_VERSION_NUMBER(__clang_major__,__clang_minor__,__clang_patchlevel__)
+#endif
+
+#include <boost/predef/detail/test.h>
+BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_CLANG,"Clang")
+
+#endif

Modified: sandbox/predef/boost/predef/compiler/comeau.h
==============================================================================
--- sandbox/predef/boost/predef/compiler/comeau.h (original)
+++ sandbox/predef/boost/predef/compiler/comeau.h 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -16,16 +16,20 @@
 /*`
 [heading `BOOST_CXX_COMO`]
 
-[@http://en.wikipedia.org/wiki/XXX Comeau] compiler.
+[@http://en.wikipedia.org/wiki/Comeau_C/C%2B%2B Comeau C++] compiler.
 Version number available as major, minor, and patch.
  */
 
 #if defined(__COMO__)
     #undef BOOST_CXX_COMO
- #define BOOST_CXX_COMO BOOST_PREDEF_MAKE_F_F_FF(__COMO_VERSION__)
+ #if defined(__CONO_VERSION__)
+ #define BOOST_CXX_COMO BOOST_PREDEF_MAKE_F_F_F(__COMO_VERSION__)
+ #else
+ #define BOOST_CXX_COMO BOOST_VERSION_NUMBER(0,0,1)
+ #endif
 #endif
 
 #include <boost/predef/detail/test.h>
-BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_COMO,"Comeau")
+BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_COMO,"Comeau C++")
 
 #endif

Modified: sandbox/predef/boost/predef/compiler/compaq.h
==============================================================================
--- sandbox/predef/boost/predef/compiler/compaq.h (original)
+++ sandbox/predef/boost/predef/compiler/compaq.h 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -14,21 +14,23 @@
 /*`
 [heading `BOOST_CXX_DEC`]
 
-[@http://en.wikipedia.org/wiki/XXX Compaq DEC] compiler.
+[@http://www.openvms.compaq.com/openvms/brochures/deccplus/ Compaq C/C++] compiler.
 Version number available as major, minor, and patch.
  */
 
 #define BOOST_CXX_DEC BOOST_VERSION_NUMBER(0,0,0)
 
-#if defined(__DECC)
+#if defined(__DECC) || defined(__DECCXX)
     #undef BOOST_CXX_DEC
- #define BOOST_CXX_DEC BOOST_VERSION_NUMBER(\
- (__DECC_VER)/10000000,\
- (__DECC_VER%10000000)/100000,\
- (__DECC_VER%10000))
+ #if defined(__DECCXX_VER)
+ #define BOOST_CXX_DEC BOOST_PREDEF_MAKE_NN_NN_0_NN_00(__DECCXX_VER)
+ #elif defined(__DECC_VER)
+ #define BOOST_CXX_DEC BOOST_PREDEF_MAKE_NN_NN_0_NN_00(__DECC_VER)
+ #else
+ #endif
 #endif
 
 #include <boost/predef/detail/test.h>
-BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_DEC,"Compaq")
+BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_DEC,"Compaq C/C++")
 
 #endif

Modified: sandbox/predef/boost/predef/compiler/diab.h
==============================================================================
--- sandbox/predef/boost/predef/compiler/diab.h (original)
+++ sandbox/predef/boost/predef/compiler/diab.h 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -14,7 +14,7 @@
 /*`
 [heading `BOOST_CXX_DIAB`]
 
-[@http://en.wikipedia.org/wiki/XXX Diab] compiler.
+[@http://www.windriver.com/products/development_suite/wind_river_compiler/ Diab C/C++] compiler.
 Version number available as major, minor, and patch.
  */
 
@@ -26,6 +26,6 @@
 #endif
 
 #include <boost/predef/detail/test.h>
-BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_DIAB,"Diab")
+BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_DIAB,"Diab C/C++")
 
 #endif

Modified: sandbox/predef/boost/predef/compiler/digitalmars.h
==============================================================================
--- sandbox/predef/boost/predef/compiler/digitalmars.h (original)
+++ sandbox/predef/boost/predef/compiler/digitalmars.h 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -14,7 +14,7 @@
 /*`
 [heading `BOOST_CXX_DMC`]
 
-[@http://en.wikipedia.org/wiki/XXX Digital Mars] compiler.
+[@http://en.wikipedia.org/wiki/Digital_Mars Digital Mars] compiler.
 Version number available as major, minor, and patch.
  */
 

Modified: sandbox/predef/boost/predef/compiler/dignus.h
==============================================================================
--- sandbox/predef/boost/predef/compiler/dignus.h (original)
+++ sandbox/predef/boost/predef/compiler/dignus.h 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -14,7 +14,7 @@
 /*`
 [heading `BOOST_CXX_SYSC`]
 
-[@http://en.wikipedia.org/wiki/XXX Dignus SysC] compiler.
+[@http://www.dignus.com/dcxx/ Dignus Systems/C++] compiler.
 Version number available as major, minor, and patch.
  */
 
@@ -26,6 +26,6 @@
 #endif
 
 #include <boost/predef/detail/test.h>
-BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_SYSC,"SysC")
+BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_SYSC,"Dignus Systems/C++")
 
 #endif

Modified: sandbox/predef/boost/predef/compiler/edg.h
==============================================================================
--- sandbox/predef/boost/predef/compiler/edg.h (original)
+++ sandbox/predef/boost/predef/compiler/edg.h 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -14,7 +14,7 @@
 /*`
 [heading `BOOST_CXX_EDG`]
 
-[@http://en.wikipedia.org/wiki/XXX EDG] compiler.
+[@http://en.wikipedia.org/wiki/Edison_Design_Group EDG C++ Frontend] compiler.
 Version number available as major, minor, and patch.
  */
 
@@ -22,10 +22,10 @@
 
 #if defined(__EDG__)
     #undef BOOST_CXX_EDG
- #define BOOST_CXX_EDG BOOST_PREDEF_MAKE_N_N_N(__EDG_VERSION__)
+ #define BOOST_CXX_EDG BOOST_PREDEF_MAKE_N_NN(__EDG_VERSION__)
 #endif
 
 #include <boost/predef/detail/test.h>
-BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_EDG,"EDG")
+BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_EDG,"EDG C++ Frontend")
 
 #endif

Modified: sandbox/predef/boost/predef/compiler/ekopath.h
==============================================================================
--- sandbox/predef/boost/predef/compiler/ekopath.h (original)
+++ sandbox/predef/boost/predef/compiler/ekopath.h 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -14,7 +14,7 @@
 /*`
 [heading `BOOST_CXX_PATH`]
 
-[@http://en.wikipedia.org/wiki/XXX Ekopath] compiler.
+[@http://en.wikipedia.org/wiki/PathScale EKOpath] compiler.
 Version number available as major, minor, and patch.
  */
 
@@ -27,6 +27,6 @@
 #endif
 
 #include <boost/predef/detail/test.h>
-BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_PATH,"Ekopath")
+BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_PATH,"EKOpath")
 
 #endif

Modified: sandbox/predef/boost/predef/compiler/gcc.h
==============================================================================
--- sandbox/predef/boost/predef/compiler/gcc.h (original)
+++ sandbox/predef/boost/predef/compiler/gcc.h 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -14,7 +14,7 @@
 /*`
 [heading `BOOST_CXX_GNUC`]
 
-[@http://en.wikipedia.org/wiki/XXX Gnu C/C++] compiler.
+[@http://en.wikipedia.org/wiki/GNU_Compiler_Collection Gnu GCC C/C++] compiler.
 Version number available as major, minor, and patch (if available).
  */
 
@@ -32,6 +32,6 @@
 #endif
 
 #include <boost/predef/detail/test.h>
-BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_GNUC,"Gnu C/C++")
+BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_GNUC,"Gnu GCC C/C++")
 
 #endif

Modified: sandbox/predef/boost/predef/compiler/greenhills.h
==============================================================================
--- sandbox/predef/boost/predef/compiler/greenhills.h (original)
+++ sandbox/predef/boost/predef/compiler/greenhills.h 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -14,18 +14,22 @@
 /*`
 [heading `BOOST_CXX_GHS`]
 
-[@http://en.wikipedia.org/wiki/XXX Green Hills] compiler.
+[@http://en.wikipedia.org/wiki/Green_Hills_Software Green Hills C/C++] compiler.
 Version number available as major, minor, and patch.
  */
 
 #define BOOST_CXX_GHS BOOST_VERSION_NUMBER(0,0,0)
 
-#if defined(__ghs)
+#if defined(__ghs) || defined(__ghs__)
     #undef BOOST_CXX_GHS
- #define BOOST_CXX_GHS BOOST_PREDEF_MAKE_N_N_N(__ghs)
+ #if defined(__GHS_VERSION_NUMBER__)
+ #define BOOST_CXX_GHS BOOST_PREDEF_MAKE_N_N_N(__GHS_VERSION_NUMBER__)
+ #else if defined(__ghs)
+ #define BOOST_CXX_GHS BOOST_PREDEF_MAKE_N_N_N(__ghs)
+ #endif
 #endif
 
 #include <boost/predef/detail/test.h>
-BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_GHS,"Green Hills")
+BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_GHS,"Green Hills C/C++")
 
 #endif

Modified: sandbox/predef/boost/predef/compiler/hp_acc.h
==============================================================================
--- sandbox/predef/boost/predef/compiler/hp_acc.h (original)
+++ sandbox/predef/boost/predef/compiler/hp_acc.h 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -14,7 +14,7 @@
 /*`
 [heading `BOOST_CXX_HPACC`]
 
-[@http://en.wikipedia.org/wiki/XXX HP ACC] compiler.
+HP aC++ compiler.
 Version number available as major, minor, and patch.
  */
 
@@ -22,10 +22,14 @@
 
 #if defined(__HP_aCC)
     #undef BOOST_CXX_HPACC
- #define BOOST_CXX_HPACC BOOST_PREDEF_MAKE_NN_NN_NN(__HP_aCC)
+ #if (__HP_aCC > 1)
+ #define BOOST_CXX_HPACC BOOST_PREDEF_MAKE_NN_NN_NN(__HP_aCC)
+ #else
+ #define BOOST_CXX_HPACC BOOST_VERSION_NUMBER(0,0,1)
+ #endif
 #endif
 
 #include <boost/predef/detail/test.h>
-BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_HPACC,"HP ACC")
+BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_HPACC,"HP aC++")
 
 #endif

Modified: sandbox/predef/boost/predef/compiler/iar.h
==============================================================================
--- sandbox/predef/boost/predef/compiler/iar.h (original)
+++ sandbox/predef/boost/predef/compiler/iar.h 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -14,7 +14,7 @@
 /*`
 [heading `BOOST_CXX_IAR`]
 
-[@http://en.wikipedia.org/wiki/XXX IAR] compiler.
+IAR C/C++ compiler.
 Version number available as major, minor, and patch.
  */
 
@@ -26,6 +26,6 @@
 #endif
 
 #include <boost/predef/detail/test.h>
-BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_IAR,"IAR")
+BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_IAR,"IAR C/C++")
 
 #endif

Modified: sandbox/predef/boost/predef/compiler/ibm.h
==============================================================================
--- sandbox/predef/boost/predef/compiler/ibm.h (original)
+++ sandbox/predef/boost/predef/compiler/ibm.h 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -14,24 +14,26 @@
 /*`
 [heading `BOOST_CXX_IBM`]
 
-[@http://en.wikipedia.org/wiki/XXX Iternational Business Mchines] compiler.
+[@http://en.wikipedia.org/wiki/VisualAge IBM XL C/C++] compiler.
 Version number available as major, minor, and patch.
  */
 
 #define BOOST_CXX_IBM BOOST_VERSION_NUMBER(0,0,0)
 
-#if defined(__IBMCPP__) || defined(__xlC__)
+#if defined(__IBMCPP__) || defined(__xlC__) || defined(__xlc__)
     #undef BOOST_CXX_IBM
     #if defined(__COMPILER_VER__)
         #define BOOST_CXX_IBM BOOST_PREDEF_MAKE_F_FF_FFFF(__COMPILER_VER__)
     #elif defined(__xlC__)
         #define BOOST_CXX_IBM BOOST_PREDEF_MAKE_FF_FF(__xlC__)
+ #elif defined(__xlc__)
+ #define BOOST_CXX_IBM BOOST_PREDEF_MAKE_FF_FF(__xlc__)
     #else
         #define BOOST_CXX_IBM BOOST_PREDEF_MAKE_N_N_N(__IBMCPP__)
     #endif
 #endif
 
 #include <boost/predef/detail/test.h>
-BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_IBM,"IBM")
+BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_IBM,"IBM XL C/C++")
 
 #endif

Modified: sandbox/predef/boost/predef/compiler/intel.h
==============================================================================
--- sandbox/predef/boost/predef/compiler/intel.h (original)
+++ sandbox/predef/boost/predef/compiler/intel.h 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -14,7 +14,7 @@
 /*`
 [heading `BOOST_CXX_INTEL`]
 
-[@http://en.wikipedia.org/wiki/XXX Intel] compiler.
+[@http://en.wikipedia.org/wiki/Intel_C%2B%2B Intel C/C++] compiler.
 Version number available as major, minor, and patch.
  */
 
@@ -23,10 +23,14 @@
 #if defined(__INTEL_COMPILER) || defined(__ICL) || defined(__ICC) || \
     defined(__ECC)
     #undef BOOST_CXX_INTEL
- #define BOOST_CXX_INTEL BOOST_PREDEF_MAKE_N_N_N(__INTEL_COMPILER)
+ #if defined(__INTEL_COMPILER)
+ #define BOOST_CXX_INTEL BOOST_PREDEF_MAKE_N_N_N(__INTEL_COMPILER)
+ #else
+ #define BOOST_CXX_INTEL BOOST_VERSION_NUMBER(0,0,1)
+ #endif
 #endif
 
 #include <boost/predef/detail/test.h>
-BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_INTEL,"Intel")
+BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_INTEL,"Intel C/C++")
 
 #endif

Modified: sandbox/predef/boost/predef/compiler/kai.h
==============================================================================
--- sandbox/predef/boost/predef/compiler/kai.h (original)
+++ sandbox/predef/boost/predef/compiler/kai.h 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -14,7 +14,7 @@
 /*`
 [heading `BOOST_CXX_KCC`]
 
-[@http://en.wikipedia.org/wiki/XXX Kai] compiler.
+Kai C++ compiler.
 Version number available as major, minor, and patch.
  */
 
@@ -26,6 +26,6 @@
 #endif
 
 #include <boost/predef/detail/test.h>
-BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_KCC,"Kai")
+BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_KCC,"Kai C++")
 
 #endif

Modified: sandbox/predef/boost/predef/compiler/llvm.h
==============================================================================
--- sandbox/predef/boost/predef/compiler/llvm.h (original)
+++ sandbox/predef/boost/predef/compiler/llvm.h 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -14,7 +14,7 @@
 /*`
 [heading `BOOST_CXX_LLVM`]
 
-[@http://en.wikipedia.org/wiki/XXX LLVM] compiler.
+[@http://en.wikipedia.org/wiki/LLVM LLVM] compiler.
  */
 
 #define BOOST_CXX_LLVM BOOST_VERSION_NUMBER(0,0,0)

Modified: sandbox/predef/boost/predef/compiler/metaware.h
==============================================================================
--- sandbox/predef/boost/predef/compiler/metaware.h (original)
+++ sandbox/predef/boost/predef/compiler/metaware.h 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -14,7 +14,7 @@
 /*`
 [heading `BOOST_CXX_HIGHC`]
 
-[@http://en.wikipedia.org/wiki/XXX Metaware HighC] compiler.
+MetaWare High C/C++ compiler.
  */
 
 #define BOOST_CXX_HIGHC BOOST_VERSION_NUMBER(0,0,0)
@@ -25,6 +25,6 @@
 #endif
 
 #include <boost/predef/detail/test.h>
-BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_HIGHC,"Metaware HighC")
+BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_HIGHC,"MetaWare High C/C++")
 
 #endif

Modified: sandbox/predef/boost/predef/compiler/metrowerks.h
==============================================================================
--- sandbox/predef/boost/predef/compiler/metrowerks.h (original)
+++ sandbox/predef/boost/predef/compiler/metrowerks.h 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -14,26 +14,30 @@
 /*`
 [heading `BOOST_CXX_MWERKS`]
 
-[@http://en.wikipedia.org/wiki/XXX Metrowerks] compiler.
+[@http://en.wikipedia.org/wiki/CodeWarrior Metrowerks CodeWarrior] compiler.
 Version number available as major, minor, and patch.
  */
 
 #define BOOST_CXX_MWERKS BOOST_VERSION_NUMBER(0,0,0)
 
-#if defined(__MWERKS__)
+#if defined(__MWERKS__) || defined(__CWCC__)
     #undef BOOST_CXX_MWERKS
- #if (__MWERKS__ >= 0x3000) && (__MWERKS__ < 0x3200)
- #define BOOST_CXX_MWERKS BOOST_VERSION_NUMBER(8,(__MWERKS__)%100,0)
- #elif (__MWERKS__ >= 0x3200) && (__MWERKS__ <= 0x3202)
- #define BOOST_CXX_MWERKS BOOST_VERSION_NUMBER(9,(__MWERKS__)%100,0)
- #elif (__MWERKS__ >= 0x3204) && (__MWERKS__ < 0x3300) // note the "skip": 04->9.3
+ #if defined(__CWCC__)
+ #define BOOST_CXX_MWERKS BOOST_PREDEF_MAKE_F_F_FF(__CWCC__)
+ #elif (__MWERKS__ >= 0x4200)
+ #define BOOST_CXX_MWERKS BOOST_PREDEF_MAKE_F_F_FF(__MWERKS__)
+ #elif (__MWERKS__ >= 0x3204) // note the "skip": 04->9.3
         #define BOOST_CXX_MWERKS BOOST_VERSION_NUMBER(9,(__MWERKS__)%100-1,0)
+ #elif (__MWERKS__ >= 0x3200)
+ #define BOOST_CXX_MWERKS BOOST_VERSION_NUMBER(9,(__MWERKS__)%100,0)
+ #elif (__MWERKS__ >= 0x3000)
+ #define BOOST_CXX_MWERKS BOOST_VERSION_NUMBER(8,(__MWERKS__)%100,0)
     #else
- #define BOOST_CXX_MWERKS BOOST_PREDEF_MAKE_F_F_FF(__MWERKS__)
+ #define BOOST_CXX_MWERKS BOOST_VERSION_NUMBER(0,0,1)
     #endif
 #endif
 
 #include <boost/predef/detail/test.h>
-BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_MWERKS,"Metrowerks")
+BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_MWERKS,"Metrowerks CodeWarrior")
 
 #endif

Modified: sandbox/predef/boost/predef/compiler/microtec.h
==============================================================================
--- sandbox/predef/boost/predef/compiler/microtec.h (original)
+++ sandbox/predef/boost/predef/compiler/microtec.h 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -14,7 +14,7 @@
 /*`
 [heading `BOOST_CXX_MRI`]
 
-[@http://en.wikipedia.org/wiki/XXX Microtec] compiler.
+[@http://www.mentor.com/microtec/ Microtec C/C++] compiler.
  */
 
 #define BOOST_CXX_MRI BOOST_VERSION_NUMBER(0,0,0)
@@ -25,6 +25,6 @@
 #endif
 
 #include <boost/predef/detail/test.h>
-BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_MRI,"Microtec")
+BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_MRI,"Microtec C/C++")
 
 #endif

Modified: sandbox/predef/boost/predef/compiler/mingw.h
==============================================================================
--- sandbox/predef/boost/predef/compiler/mingw.h (original)
+++ sandbox/predef/boost/predef/compiler/mingw.h 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -14,17 +14,24 @@
 /*`
 [heading `BOOST_CXX_MINGW`]
 
-[@http://en.wikipedia.org/wiki/XXX MinGW] compiler.
+[@http://en.wikipedia.org/wiki/MinGW MinGW] compiler.
 Version number available as major, minor, and patch.
  */
 
 #define BOOST_CXX_MINGW BOOST_VERSION_NUMBER(0,0,0)
 
-#if defined(__MINGW32__)
+#if defined(__MINGW32__) || defined(__MINGW64__)
     #include <_mingw.h>
     #undef BOOST_CXX_MINGW
- #define BOOST_CXX_MINGW \
- BOOST_VERSION_NUMBER(__MINGW32_MAJOR_VERSION,__MINGW32_MINOR_VERSION,0)
+ #if defined(__MINGW64_VERSION_MAJOR) && defined(__MINGW64_VERSION_MINOR)
+ #define BOOST_CXX_MINGW \
+ BOOST_VERSION_NUMBER(__MINGW64_VERSION_MAJOR,__MINGW64_VERSION_MINOR,0)
+ #elif defined(__MINGW32_VERSION_MAJOR) && defined(__MINGW32_VERSION_MINOR)
+ #define BOOST_CXX_MINGW \
+ BOOST_VERSION_NUMBER(__MINGW32_MAJOR_VERSION,__MINGW32_MINOR_VERSION,0)
+ #else
+ #define BOOST_CXX_MINGW BOOST_VERSION_NUMBER(0,0,1)
+ #endif
 #endif
 
 #include <boost/predef/detail/test.h>

Modified: sandbox/predef/boost/predef/compiler/mpw.h
==============================================================================
--- sandbox/predef/boost/predef/compiler/mpw.h (original)
+++ sandbox/predef/boost/predef/compiler/mpw.h 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -14,18 +14,22 @@
 /*`
 [heading `BOOST_CXX_MPW`]
 
-[@http://en.wikipedia.org/wiki/XXX MPW] compiler.
+[@http://en.wikipedia.org/wiki/Macintosh_Programmer%27s_Workshop MPW C++] compiler.
 Version number available as major, and minor.
  */
 
 #define BOOST_CXX_MPW BOOST_VERSION_NUMBER(0,0,0)
 
-#if defined(__MRC__)
+#if defined(__MRC__) || defined(MPW_C) || defined(MPW_CPLUS)
     #undef BOOST_CXX_MPW
- #define BOOST_CXX_MPW BOOST_PREDEF_MAKE_FF_FF(__MRC__)
+ #if defined(__MRC__)
+ #define BOOST_CXX_MPW BOOST_PREDEF_MAKE_FF_FF(__MRC__)
+ #else
+ #define BOOST_CXX_MPW BOOST_VERSION_NUMBER(0,0,1)
+ #endif
 #endif
 
 #include <boost/predef/detail/test.h>
-BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_MPW,"MPW")
+BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_MPW,"MPW C++")
 
 #endif

Modified: sandbox/predef/boost/predef/compiler/palm.h
==============================================================================
--- sandbox/predef/boost/predef/compiler/palm.h (original)
+++ sandbox/predef/boost/predef/compiler/palm.h 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -14,7 +14,7 @@
 /*`
 [heading `BOOST_CXX_PALM`]
 
-[@http://en.wikipedia.org/wiki/XXX Palm] compiler.
+Palm C/C++ compiler.
 Version number available as major, minor, and patch.
  */
 
@@ -26,6 +26,6 @@
 #endif
 
 #include <boost/predef/detail/test.h>
-BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_PALM,"Palm")
+BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_PALM,"Palm C/C++")
 
 #endif

Modified: sandbox/predef/boost/predef/compiler/pgi.h
==============================================================================
--- sandbox/predef/boost/predef/compiler/pgi.h (original)
+++ sandbox/predef/boost/predef/compiler/pgi.h 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -14,17 +14,21 @@
 /*`
 [heading `BOOST_CXX_PGI`]
 
-[@http://en.wikipedia.org/wiki/XXX PGI] compiler.
+[@http://en.wikipedia.org/wiki/The_Portland_Group Portland Group C/C++] compiler.
  */
 
 #define BOOST_CXX_PGI BOOST_VERSION_NUMBER(0,0,0)
 
 #if defined(__PGI)
     #undef BOOST_CXX_PGI
- #define BOOST_CXX_PGI BOOST_VERSION_NUMBER(0,0,1)
+ #if defined(__PGIC__) && defined(__PGIC_MINOR__) && defined(__PGIC_PATCHLEVEL__)
+ #define BOOST_CXX_PGI BOOST_VERSION_NUMBER(__PGIC__,__PGIC_MINOR__,__PGIC_PATCHLEVEL__)
+ #else
+ #define BOOST_CXX_PGI BOOST_VERSION_NUMBER(0,0,1)
+ #endif
 #endif
 
 #include <boost/predef/detail/test.h>
-BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_PGI,"PGI")
+BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_PGI,"Portland Group C/C++")
 
 #endif

Modified: sandbox/predef/boost/predef/compiler/sgi_mipspro.h
==============================================================================
--- sandbox/predef/boost/predef/compiler/sgi_mipspro.h (original)
+++ sandbox/predef/boost/predef/compiler/sgi_mipspro.h 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -14,22 +14,24 @@
 /*`
 [heading `BOOST_CXX_SGI`]
 
-[@http://en.wikipedia.org/wiki/XXX SGI Mips-pro] compiler.
+[@http://en.wikipedia.org/wiki/MIPSpro SGI MIPSpro] compiler.
 Version number available as major, minor, and patch.
  */
 
 #define BOOST_CXX_SGI BOOST_VERSION_NUMBER(0,0,0)
 
-#if defined(__sgi)
+#if defined(__sgi) || defined(sgi)
     #undef BOOST_CXX_SGI
     #if defined(_SGI_COMPILER_VERSION)
         #define BOOST_CXX_SGI BOOST_PREDEF_MAKE_N_N_N(_SGI_COMPILER_VERSION)
- #else
+ #elif defined(_COMPILER_VERSION)
         #define BOOST_CXX_SGI BOOST_PREDEF_MAKE_N_N_N(_COMPILER_VERSION)
+ #else
+ #define BOOST_CXX_SGI BOOST_VERSION_NUMBER(0,0,1)
     #endif
 #endif
 
 #include <boost/predef/detail/test.h>
-BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_SGI,"SGI Mips-pro")
+BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_SGI,"SGI MIPSpro")
 
 #endif

Modified: sandbox/predef/boost/predef/compiler/sunpro.h
==============================================================================
--- sandbox/predef/boost/predef/compiler/sunpro.h (original)
+++ sandbox/predef/boost/predef/compiler/sunpro.h 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -14,18 +14,24 @@
 /*`
 [heading `BOOST_CXX_SUNPRO`]
 
-[@http://en.wikipedia.org/wiki/XXX Sun Pro] compiler.
+[@http://en.wikipedia.org/wiki/Sun_Studio_%28software%29 Sun Studio] compiler.
 Version number available as major, minor, and patch.
  */
 
 #define BOOST_CXX_SUNPRO BOOST_VERSION_NUMBER(0,0,0)
 
-#if defined(__SUNPRO_CC)
+#if defined(__SUNPRO_CC) || defined(__SUNPRO_C)
     #undef BOOST_CXX_SUNPRO
- #define BOOST_CXX_SUNPRO BOOST_PREDEF_MAKE_F_F_F(__SUNPRO_CC)
+ #if defined(__SUNPRO_CC)
+ #define BOOST_CXX_SUNPRO BOOST_PREDEF_MAKE_F_F_F(__SUNPRO_CC)
+ #elif defined(__SUNPRO_C)
+ #define BOOST_CXX_SUNPRO BOOST_PREDEF_MAKE_F_F_F(__SUNPRO_C)
+ #else
+ #define BOOST_CXX_SUNPRO BOOST_VERSION_NUMBER(0,0,1)
+ #endif
 #endif
 
 #include <boost/predef/detail/test.h>
-BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_SUNPRO,"Sun Pro")
+BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_SUNPRO,"Sun Studio")
 
 #endif

Modified: sandbox/predef/boost/predef/compiler/tendra.h
==============================================================================
--- sandbox/predef/boost/predef/compiler/tendra.h (original)
+++ sandbox/predef/boost/predef/compiler/tendra.h 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -14,7 +14,7 @@
 /*`
 [heading `BOOST_CXX_TENDRA`]
 
-[@http://en.wikipedia.org/wiki/XXX Tendra] compiler.
+[@http://en.wikipedia.org/wiki/TenDRA_Compiler TenDRA C/C++] compiler.
  */
 
 #define BOOST_CXX_TENDRA BOOST_VERSION_NUMBER(0,0,0)
@@ -25,6 +25,6 @@
 #endif
 
 #include <boost/predef/detail/test.h>
-BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_TENDRA,"Tendra")
+BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_TENDRA,"TenDRA C/C++")
 
 #endif

Modified: sandbox/predef/boost/predef/compiler/visualc.h
==============================================================================
--- sandbox/predef/boost/predef/compiler/visualc.h (original)
+++ sandbox/predef/boost/predef/compiler/visualc.h 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -14,7 +14,7 @@
 /*`
 [heading `BOOST_CXX_MSVC`]
 
-[@http://en.wikipedia.org/wiki/XXX Microsoft Visual C/C++] compiler.
+[@http://en.wikipedia.org/wiki/Visual_studio Microsoft Visual C/C++] compiler.
 Version number available as major, minor, and patch.
  */
 

Modified: sandbox/predef/boost/predef/compiler/watcom.h
==============================================================================
--- sandbox/predef/boost/predef/compiler/watcom.h (original)
+++ sandbox/predef/boost/predef/compiler/watcom.h 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -14,7 +14,7 @@
 /*`
 [heading `BOOST_CXX_WATCOM`]
 
-[@http://en.wikipedia.org/wiki/XXX Watcom] compiler.
+[@http://en.wikipedia.org/wiki/Watcom Watcom C++] compiler.
 Version number available as major, and minor.
  */
 
@@ -26,6 +26,6 @@
 #endif
 
 #include <boost/predef/detail/test.h>
-BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_WATCOM,"Watcom")
+BOOST_PREDEF_DECLARE_TEST(BOOST_CXX_WATCOM,"Watcom C++")
 
 #endif

Modified: sandbox/predef/boost/predef/library/c/uc.h
==============================================================================
--- sandbox/predef/boost/predef/library/c/uc.h (original)
+++ sandbox/predef/boost/predef/library/c/uc.h 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -27,6 +27,6 @@
 #endif
 
 #include <boost/predef/detail/test.h>
-BOOST_PREDEF_DECLARE_TEST(BOOST_LIBC_UC,"uC")
+BOOST_PREDEF_DECLARE_TEST(BOOST_LIBC_UC,"uClibc")
 
 #endif

Modified: sandbox/predef/boost/predef/library/c/vms.h
==============================================================================
--- sandbox/predef/boost/predef/library/c/vms.h (original)
+++ sandbox/predef/boost/predef/library/c/vms.h 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -22,10 +22,7 @@
 
 #if defined(__CRTL_VER)
     #undef BOOST_LIBC_VMS
- #define BOOST_LIBC_VMS BOOST_VERSION_NUMBER(
- (__CRTL_VER)/10000000,\
- (__CRTL_VER%10000000)/100000,\
- (__CRTL_VER%10000)/100)
+ #define BOOST_LIBC_VMS BOOST_PREDEF_MAKE_NN_NN_0_NN_00(__CRTL_VER)
 #endif
 
 #include <boost/predef/detail/test.h>

Modified: sandbox/predef/boost/predef/library/std/cxx.h
==============================================================================
--- sandbox/predef/boost/predef/library/std/cxx.h (original)
+++ sandbox/predef/boost/predef/library/std/cxx.h 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -22,7 +22,7 @@
 
 #if defined(_LIBCPP_VERSION)
     #undef BOOST_LIBSTD_CXX
- #define BOOST_LIBSTD_CXX BOOST_PREDEF_MAKE_NN_NN(__CPPLIB_VER)
+ #define BOOST_LIBSTD_CXX BOOST_PREDEF_MAKE_N__NNN(_LIBCPP_VERSION)
 #endif
 
 #include <boost/predef/detail/test.h>

Modified: sandbox/predef/boost/predef/library/std/roguewave.h
==============================================================================
--- sandbox/predef/boost/predef/library/std/roguewave.h (original)
+++ sandbox/predef/boost/predef/library/std/roguewave.h 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -14,7 +14,7 @@
 /*`
 [heading `BOOST_LIBSTD_RW`]
 
-[@http://en.wikipedia.org/wiki/XXX Roguewave Standard C++] library.
+[@http://stdcxx.apache.org/ Roguewave] Standard C++ library.
 If available version number as major, minor, and patch.
  */
 

Modified: sandbox/predef/boost/predef/library/std/sgi.h
==============================================================================
--- sandbox/predef/boost/predef/library/std/sgi.h (original)
+++ sandbox/predef/boost/predef/library/std/sgi.h 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -14,7 +14,7 @@
 /*`
 [heading `BOOST_LIBSTD_SGI`]
 
-[@http://en.wikipedia.org/wiki/XXX SGI Standard C++] library.
+[@http://www.sgi.com/tech/stl/ SGI] Standard C++ library.
 If available version number as major, minor, and patch.
  */
 

Modified: sandbox/predef/boost/predef/library/std/stlport.h
==============================================================================
--- sandbox/predef/boost/predef/library/std/stlport.h (original)
+++ sandbox/predef/boost/predef/library/std/stlport.h 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -14,7 +14,7 @@
 /*`
 [heading `BOOST_LIBSTD_STLPORT`]
 
-[@http://en.wikipedia.org/wiki/XXX STLport Standard C++] library.
+[@http://sourceforge.net/projects/stlport/ STLport Standard C++] library.
 Version number available as major, minor, and patch.
  */
 

Modified: sandbox/predef/boost/predef/library/std/vacpp.h
==============================================================================
--- sandbox/predef/boost/predef/library/std/vacpp.h (original)
+++ sandbox/predef/boost/predef/library/std/vacpp.h 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -14,7 +14,7 @@
 /*`
 [heading `BOOST_LIBSTD_IBM`]
 
-[@http://en.wikipedia.org/wiki/XXX IBM VACPP Standard C++] library.
+[@http://www.ibm.com/software/awdtools/xlcpp/ IBM VACPP Standard C++] library.
  */
 
 #define BOOST_LIBSTD_IBM BOOST_VERSION_NUMBER(0,0,0)

Modified: sandbox/predef/boost/predef/make.h
==============================================================================
--- sandbox/predef/boost/predef/make.h (original)
+++ sandbox/predef/boost/predef/make.h 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -48,25 +48,33 @@
 separates the major/minor/patch parts of the version number,
 and "`0`" indicates an ignored decimal digit. Macros are:
 */
+/*` `BOOST_PREDEF_MAKE_N__NNN(V)` */
+#define BOOST_PREDEF_MAKE_N__NNN(V) BOOST_VERSION_NUMBER(((V)/1000)%10,0,(V)%1000)
 /*` `BOOST_PREDEF_MAKE_N_N_N(V)` */
-#define BOOST_PREDEF_MAKE_N_N_N(V) BOOST_VERSION_NUMBER((V)/100,(V%100)/10,(V%10))
-/*` `BOOST_PREDEF_MAKE_NN_NN_NN(V)` */
-#define BOOST_PREDEF_MAKE_NN_NN_NN(V) BOOST_VERSION_NUMBER((V)/10000,(V%10000)/100,(V%100))
-/*` `BOOST_PREDEF_MAKE_NN_NN(V)` */
-#define BOOST_PREDEF_MAKE_NN_NN(V) BOOST_VERSION_NUMBER((V%10000)/100,(V%100),0)
+#define BOOST_PREDEF_MAKE_N_N_N(V) BOOST_VERSION_NUMBER(((V)/100)%10,((V)/10)%10,(V)%10)
+/*` `BOOST_PREDEF_MAKE_N_N_N_000(V)` */
+#define BOOST_PREDEF_MAKE_N_N_N_000(V) BOOST_VERSION_NUMBER(((V)/100000)%10,((V)/10000)%10,((V)/1000)%10)
 /*` `BOOST_PREDEF_MAKE_N_N_NN(V)` */
-#define BOOST_PREDEF_MAKE_N_N_NN(V) BOOST_VERSION_NUMBER((V)/1000,(V%1000)/100,(V%100))
+#define BOOST_PREDEF_MAKE_N_N_NN(V) BOOST_VERSION_NUMBER(((V)/1000)%10,((V)/100)%10,(V)%100)
+/*` `BOOST_PREDEF_MAKE_N_NN(V)` */
+#define BOOST_PREDEF_MAKE_N_NN(V) BOOST_VERSION_NUMBER(((V)/100)%10,(V)%100,0)
 /*` `BOOST_PREDEF_MAKE_N_NN_NN(V)` */
-#define BOOST_PREDEF_MAKE_N_NN_NN(V) BOOST_VERSION_NUMBER((V)/10000,(V%10000)/100,(V%100))
-/*` `BOOST_PREDEF_MAKE_N_N_N_000(V)` */
-#define BOOST_PREDEF_MAKE_N_N_N_000(V) BOOST_VERSION_NUMBER((V%1000000)/100000,(V%100000)/10000,(V%10000)/1000)
+#define BOOST_PREDEF_MAKE_N_NN_NN(V) BOOST_VERSION_NUMBER(((V)/10000)%10,((V)/100)%100,(V)%100)
 /*` `BOOST_PREDEF_MAKE_N_NN_000(V)` */
-#define BOOST_PREDEF_MAKE_N_NN_000(V) BOOST_VERSION_NUMBER((V%1000000)/100000,(V%100000)/1000,0)
-/*` `BOOST_PREDEF_MAKE_NN_NN_00_NN_00(V)` */
-#define BOOST_PREDEF_MAKE_NN_NN_00_NN_00(V) BOOST_VERSION_NUMBER((V)/100000000,(V%100000000)/1000000,(V%10000)/100)
+#define BOOST_PREDEF_MAKE_N_NN_000(V) BOOST_VERSION_NUMBER(((V)/100000)%10,((V)/1000)%100,0)
 /*` `BOOST_PREDEF_MAKE_NN_00(V)` */
-#define BOOST_PREDEF_MAKE_NN_00(V) BOOST_VERSION_NUMBER((V)/100,0,0)
+#define BOOST_PREDEF_MAKE_NN_00(V) BOOST_VERSION_NUMBER(((V)/100)%100,0,0)
+/*` `BOOST_PREDEF_MAKE_NN_NN(V)` */
+#define BOOST_PREDEF_MAKE_NN_NN(V) BOOST_VERSION_NUMBER(((V)/100)%100,(V)%100,0)
+/*` `BOOST_PREDEF_MAKE_NN_NN_NN(V)` */
+#define BOOST_PREDEF_MAKE_NN_NN_NN(V) BOOST_VERSION_NUMBER(((V)/10000)%100,((V)/100)%100,(V)%100)
+/*` `BOOST_PREDEF_MAKE_NN_NN_0_NN_00(V)` */
+#define BOOST_PREDEF_MAKE_NN_NN_0_NN_00(V) BOOST_VERSION_NUMBER(((V)/10000000)%100,((V)/100000)%100,((V)/100)%100)
+/*` `BOOST_PREDEF_MAKE_NN_NN_0_NNNN(V)` */
+#define BOOST_PREDEF_MAKE_NN_NN_0_NNNN(V) BOOST_VERSION_NUMBER(((V)/10000000)%100,((V)/100000)%100,(V)%10000)
+/*` `BOOST_PREDEF_MAKE_NN_NN_00_NN_00(V)` */
+#define BOOST_PREDEF_MAKE_NN_NN_00_NN_00(V) BOOST_VERSION_NUMBER(((V)/100000000)%100,((V)/1000000)%100,((V)/100)%100)
 /*` `BOOST_PREDEF_MAKE_YYYY_MM_DD(V)` */
-#define BOOST_PREDEF_MAKE_YYYY_MM_DD(V) BOOST_VERSION_NUMBER((V)/10000-1970,(V%10000)/100,(V%100))
+#define BOOST_PREDEF_MAKE_YYYY_MM_DD(V) BOOST_VERSION_NUMBER(((V)/10000)%10000-1970,((V)/100)%100,(V)%100)
 
 #endif

Modified: sandbox/predef/boost/predef/os.h
==============================================================================
--- sandbox/predef/boost/predef/os.h (original)
+++ sandbox/predef/boost/predef/os.h 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -17,9 +17,11 @@
 #include <boost/predef/os/irix.h>
 #include <boost/predef/os/linux.h>
 #include <boost/predef/os/macos.h>
+#include <boost/predef/os/os400.h>
 #include <boost/predef/os/qnxnto.h>
 #include <boost/predef/os/solaris.h>
 #include <boost/predef/os/unix.h>
+#include <boost/predef/os/vms.h>
 #include <boost/predef/os/windows.h>
 
 #endif

Modified: sandbox/predef/boost/predef/os/aix.h
==============================================================================
--- sandbox/predef/boost/predef/os/aix.h (original)
+++ sandbox/predef/boost/predef/os/aix.h 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -12,9 +12,9 @@
 #include <boost/predef/make.h>
 
 /*`
-[heading `BOOST_OS_`]
+[heading `BOOST_OS_AIX`]
 
-[@http://en.wikipedia.org/wiki/XXX AIX] operating system.
+[@http://en.wikipedia.org/wiki/AIX_operating_system IBM AIX] operating system.
 Version number available as major, minor, and patch.
  */
 
@@ -36,6 +36,6 @@
 #endif
 
 #include <boost/predef/detail/test.h>
-BOOST_PREDEF_DECLARE_TEST(BOOST_OS_AIX,"AIX")
+BOOST_PREDEF_DECLARE_TEST(BOOST_OS_AIX,"IBM AIX")
 
 #endif

Modified: sandbox/predef/boost/predef/os/amigaos.h
==============================================================================
--- sandbox/predef/boost/predef/os/amigaos.h (original)
+++ sandbox/predef/boost/predef/os/amigaos.h 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -14,7 +14,7 @@
 /*`
 [heading `BOOST_OS_AMIGAOS`]
 
-[@http://en.wikipedia.org/wiki/XXX AmigaOS] operating system.
+[@http://en.wikipedia.org/wiki/AmigaOS AmigaOS] operating system.
  */
 
 #define BOOST_OS_AMIGAOS BOOST_VERSION_NUMBER(0,0,0)

Modified: sandbox/predef/boost/predef/os/beos.h
==============================================================================
--- sandbox/predef/boost/predef/os/beos.h (original)
+++ sandbox/predef/boost/predef/os/beos.h 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -14,7 +14,7 @@
 /*`
 [heading `BOOST_OS_BEOS`]
 
-[@http://en.wikipedia.org/wiki/XXX Be] operating system.
+[@http://en.wikipedia.org/wiki/BeOS BeOS] operating system.
  */
 
 #define BOOST_OS_BEOS BOOST_VERSION_NUMBER(0,0,0)
@@ -25,6 +25,6 @@
 #endif
 
 #include <boost/predef/detail/test.h>
-BOOST_PREDEF_DECLARE_TEST(BOOST_OS_BEOS,"Be OS")
+BOOST_PREDEF_DECLARE_TEST(BOOST_OS_BEOS,"BeOS")
 
 #endif

Modified: sandbox/predef/boost/predef/os/bsd.h
==============================================================================
--- sandbox/predef/boost/predef/os/bsd.h (original)
+++ sandbox/predef/boost/predef/os/bsd.h 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -14,17 +14,17 @@
 /*`
 [heading `BOOST_OS_BSD`]
 
-[@http://en.wikipedia.org/wiki/XXX BSD] operating system.
+[@http://en.wikipedia.org/wiki/Berkeley_Software_Distribution BSD] operating system.
 
 BSD has various branch operating systems possible and each detected
 individually. This detects the following variations and sets a specific
 version number macro to match:
 
-* `BOOST_OS_DRAGONFLY_BSD` [@http://en.wikipedia.org/wiki/XXX Dragonfly BSD]
-* `BOOST_OS_FREE_BSD` [@http://en.wikipedia.org/wiki/XXX Free BSD]
-* `BOOST_OS_BSDI_BSD` [@http://en.wikipedia.org/wiki/XXX BSDI]
-* `BOOST_OS_NET_BSD` [@http://en.wikipedia.org/wiki/XXX Net BSD]
-* `BOOST_OS_OPEN_BSD` [@http://en.wikipedia.org/wiki/XXX Open BSD]
+* `BOOST_OS_DRAGONFLY_BSD` [@http://en.wikipedia.org/wiki/DragonFly_BSD DragonFly BSD]
+* `BOOST_OS_FREE_BSD` [@http://en.wikipedia.org/wiki/Freebsd FreeBSD]
+* `BOOST_OS_BSDI_BSD` [@http://en.wikipedia.org/wiki/BSD/OS BSDi BSD/OS]
+* `BOOST_OS_NET_BSD` [@http://en.wikipedia.org/wiki/Netbsd NetBSD]
+* `BOOST_OS_OPEN_BSD` [@http://en.wikipedia.org/wiki/Openbsd OpenBSD]
 
 [note The general `BOOST_OS_BSD` is set in all cases to indicate some form
 of BSD. If the above variants is detected the corresponding macro is also set.]
@@ -47,6 +47,7 @@
     #undef BOOST_OS_FREE_BSD
     #undef BOOST_OS_NET_BSD
     #undef BOOST_OS_OPEN_BSD
+ #include <sys/param.h>
     #if defined(BSD4_2)
         #define BOOST_OS_BSD BOOST_VERSION_NUMBER(4,2,0)
     #elif defined(BSD4_3)
@@ -148,10 +149,10 @@
 
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_OS_BSD,"BSD")
-BOOST_PREDEF_DECLARE_TEST(BOOST_OS_DRAGONFLY_BSD,"Dragonfly BSD")
+BOOST_PREDEF_DECLARE_TEST(BOOST_OS_DRAGONFLY_BSD,"DragonFly BSD")
 BOOST_PREDEF_DECLARE_TEST(BOOST_OS_FREE_BSD,"Free BSD")
-BOOST_PREDEF_DECLARE_TEST(BOOST_OS_BSDI_BSD,"BSDI BSD")
-BOOST_PREDEF_DECLARE_TEST(BOOST_OS_NET_BSD,"Net BSD")
-BOOST_PREDEF_DECLARE_TEST(BOOST_OS_OPEN_BSD,"Open BSD")
+BOOST_PREDEF_DECLARE_TEST(BOOST_OS_BSDI_BSD,"BSDi BSD/OS")
+BOOST_PREDEF_DECLARE_TEST(BOOST_OS_NET_BSD,"NetBSD")
+BOOST_PREDEF_DECLARE_TEST(BOOST_OS_OPEN_BSD,"OpenBSD")
 
 #endif

Modified: sandbox/predef/boost/predef/os/cygwin.h
==============================================================================
--- sandbox/predef/boost/predef/os/cygwin.h (original)
+++ sandbox/predef/boost/predef/os/cygwin.h 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -14,7 +14,7 @@
 /*`
 [heading `BOOST_OS_CYGWIN`]
 
-[@http://en.wikipedia.org/wiki/XXX Cygwin] operating system.
+[@http://en.wikipedia.org/wiki/Cygwin Cygwin] evironment.
  */
 
 #define BOOST_OS_CYGWIN BOOST_VERSION_NUMBER(0,0,0)

Modified: sandbox/predef/boost/predef/os/hpux.h
==============================================================================
--- sandbox/predef/boost/predef/os/hpux.h (original)
+++ sandbox/predef/boost/predef/os/hpux.h 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -14,7 +14,7 @@
 /*`
 [heading `BOOST_OS_HPUX`]
 
-[@http://en.wikipedia.org/wiki/XXX HP-UX] operating system.
+[@http://en.wikipedia.org/wiki/HP-UX HP-UX] operating system.
  */
 
 #define BOOST_OS_HPUX BOOST_VERSION_NUMBER(0,0,0)

Modified: sandbox/predef/boost/predef/os/irix.h
==============================================================================
--- sandbox/predef/boost/predef/os/irix.h (original)
+++ sandbox/predef/boost/predef/os/irix.h 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -14,7 +14,7 @@
 /*`
 [heading `BOOST_OS_IRIX`]
 
-[@http://en.wikipedia.org/wiki/XXX Irix] operating system.
+[@http://en.wikipedia.org/wiki/Irix IRIX] operating system.
  */
 
 #define BOOST_OS_IRIX BOOST_VERSION_NUMBER(0,0,0)
@@ -25,6 +25,6 @@
 #endif
 
 #include <boost/predef/detail/test.h>
-BOOST_PREDEF_DECLARE_TEST(BOOST_OS_IRIX,"Irix")
+BOOST_PREDEF_DECLARE_TEST(BOOST_OS_IRIX,"IRIX")
 
 #endif

Modified: sandbox/predef/boost/predef/os/linux.h
==============================================================================
--- sandbox/predef/boost/predef/os/linux.h (original)
+++ sandbox/predef/boost/predef/os/linux.h 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -14,7 +14,7 @@
 /*`
 [heading `BOOST_OS_LINUX`]
 
-[@http://en.wikipedia.org/wiki/XXX Linux] operating system.
+[@http://en.wikipedia.org/wiki/Linux Linux] operating system.
  */
 
 #define BOOST_OS_LINUX BOOST_VERSION_NUMBER(0,0,0)

Modified: sandbox/predef/boost/predef/os/macos.h
==============================================================================
--- sandbox/predef/boost/predef/os/macos.h (original)
+++ sandbox/predef/boost/predef/os/macos.h 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -14,7 +14,7 @@
 /*`
 [heading `BOOST_OS_MACOS`]
 
-[@http://en.wikipedia.org/wiki/XXX MacOS] operating system.
+[@http://en.wikipedia.org/wiki/Mac_OS Mac OS] operating system.
 Versions \[9-10\] are specifically detected.
  */
 
@@ -31,6 +31,6 @@
 #endif
 
 #include <boost/predef/detail/test.h>
-BOOST_PREDEF_DECLARE_TEST(BOOST_OS_MACOS,"MacOS")
+BOOST_PREDEF_DECLARE_TEST(BOOST_OS_MACOS,"Mac OS")
 
 #endif

Added: sandbox/predef/boost/predef/os/os400.h
==============================================================================
--- (empty file)
+++ sandbox/predef/boost/predef/os/os400.h 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -0,0 +1,30 @@
+/*
+Copyright Redshift Software Inc 2011
+Distributed under the Boost Software License, Version 1.0.
+(See accompanying file LICENSE_1_0.txt or copy at
+http://www.boost.org/LICENSE_1_0.txt)
+*/
+
+#ifndef BOOST_PREDEF_OS_OS400_H
+#define BOOST_PREDEF_OS_OS400_H
+
+#include <boost/predef/version_number.h>
+#include <boost/predef/make.h>
+
+/*`
+[heading `BOOST_OS_OS400`]
+
+[@http://en.wikipedia.org/wiki/IBM_i IBM OS/400] operating system.
+ */
+
+#define BOOST_OS_OS400 BOOST_VERSION_NUMBER(0,0,0)
+
+#if defined(__OS400__)
+ #undef BOOST_OS_OS400
+ #define BOOST_OS_OS400 BOOST_VERSION_NUMBER(0,0,1)
+#endif
+
+#include <boost/predef/detail/test.h>
+BOOST_PREDEF_DECLARE_TEST(BOOST_OS_OS400,"IBM OS/400")
+
+#endif

Modified: sandbox/predef/boost/predef/os/qnxnto.h
==============================================================================
--- sandbox/predef/boost/predef/os/qnxnto.h (original)
+++ sandbox/predef/boost/predef/os/qnxnto.h 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -14,7 +14,7 @@
 /*`
 [heading `BOOST_OS_QNX`]
 
-[@http://en.wikipedia.org/wiki/XXX QNX-NTO] operating system.
+[@http://en.wikipedia.org/wiki/QNX QNX] operating system.
 Version number available as major, and minor if possible. And
 version 4 is specifically detected.
  */
@@ -33,6 +33,6 @@
 #endif
 
 #include <boost/predef/detail/test.h>
-BOOST_PREDEF_DECLARE_TEST(BOOST_OS_QNX,"QNX-NTO")
+BOOST_PREDEF_DECLARE_TEST(BOOST_OS_QNX,"QNX")
 
 #endif

Modified: sandbox/predef/boost/predef/os/solaris.h
==============================================================================
--- sandbox/predef/boost/predef/os/solaris.h (original)
+++ sandbox/predef/boost/predef/os/solaris.h 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -14,7 +14,7 @@
 /*`
 [heading `BOOST_OS_SOLARIS`]
 
-[@http://en.wikipedia.org/wiki/XXX Solaris] operating system.
+[@http://en.wikipedia.org/wiki/Solaris_Operating_Environment Solaris] operating system.
  */
 
 #define BOOST_OS_SOLARIS BOOST_VERSION_NUMBER(0,0,0)

Modified: sandbox/predef/boost/predef/os/unix.h
==============================================================================
--- sandbox/predef/boost/predef/os/unix.h (original)
+++ sandbox/predef/boost/predef/os/unix.h 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -14,7 +14,7 @@
 /*`
 [heading `BOOST_OS_UNIX`]
 
-[@http://en.wikipedia.org/wiki/XXX Unix] operating system.
+[@http://en.wikipedia.org/wiki/Unix Unix Environment] operating system.
  */
 
 #define BOOST_OS_UNIX BOOST_VERSION_NUMBER(0,0,0)
@@ -25,7 +25,22 @@
     #define BOOST_OS_UNIX BOOST_VERSION_NUMBER(0,0,1)
 #endif
 
+/*`
+[heading `BOOST_OS_SVR4`]
+
+[@http://en.wikipedia.org/wiki/UNIX_System_V SVR4 Environment] operating system.
+ */
+
+#define BOOST_OS_SVR4 BOOST_VERSION_NUMBER(0,0,0)
+
+#if defined(__sysv__) || defined(__SVR4) || \
+ defined(__svr4__) || defined(_SYSTYPE_SVR4)
+ #undef BOOST_OS_SVR4
+ #define BOOST_OS_SVR4 BOOST_VERSION_NUMBER(0,0,1)
+#endif
+
 #include <boost/predef/detail/test.h>
-BOOST_PREDEF_DECLARE_TEST(BOOST_OS_UNIX,"Unix")
+BOOST_PREDEF_DECLARE_TEST(BOOST_OS_UNIX,"Unix ENvironment")
+BOOST_PREDEF_DECLARE_TEST(BOOST_OS_SVR4,"SVR4 Environment")
 
 #endif

Added: sandbox/predef/boost/predef/os/vms.h
==============================================================================
--- (empty file)
+++ sandbox/predef/boost/predef/os/vms.h 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -0,0 +1,35 @@
+/*
+Copyright Redshift Software Inc 2011
+Distributed under the Boost Software License, Version 1.0.
+(See accompanying file LICENSE_1_0.txt or copy at
+http://www.boost.org/LICENSE_1_0.txt)
+*/
+
+#ifndef BOOST_PREDEF_OS_VMS_H
+#define BOOST_PREDEF_OS_VMS_H
+
+#include <boost/predef/version_number.h>
+#include <boost/predef/make.h>
+
+/*`
+[heading `BOOST_OS_VMS`]
+
+[@http://en.wikipedia.org/wiki/Vms VMS] operating system.
+Version number available as major, minor, and patch.
+ */
+
+#define BOOST_OS_VMS BOOST_VERSION_NUMBER(0,0,0)
+
+#if defined(VMS) || defined(__VMS)
+ #undef BOOST_OS_VMS
+ #if defined(__VMS_VER)
+ #define BOOST_OS_VMS BOOST_PREDEF_MAKE_NN_NN_00_NN_00(__VMS_VER)
+ #else
+ #define BOOST_OS_VMS BOOST_VERSION_NUMBER(0,0,1)
+ #endif
+#endif
+
+#include <boost/predef/detail/test.h>
+BOOST_PREDEF_DECLARE_TEST(BOOST_OS_VMS,"VMS")
+
+#endif

Modified: sandbox/predef/boost/predef/os/windows.h
==============================================================================
--- sandbox/predef/boost/predef/os/windows.h (original)
+++ sandbox/predef/boost/predef/os/windows.h 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -14,18 +14,19 @@
 /*`
 [heading `BOOST_OS_WINDOWS`]
 
-[@http://en.wikipedia.org/wiki/XXX Microsoft Windows] operating system.
+[@http://en.wikipedia.org/wiki/Category:Microsoft_Windows Microsoft Windows] operating system.
  */
 
 #define BOOST_OS_WINDOWS BOOST_VERSION_NUMBER(0,0,0)
 
 #if defined(_WIN32) || defined(_WIN64) || \
- defined(__WIN32__) || defined(__TOS_WIN__)
+ defined(__WIN32__) || defined(__TOS_WIN__) || \
+ defined(__WINDOWS__)
     #undef BOOST_OS_WINDOWS
     #define BOOST_OS_WINDOWS BOOST_VERSION_NUMBER(0,0,1)
 #endif
 
 #include <boost/predef/detail/test.h>
-BOOST_PREDEF_DECLARE_TEST(BOOST_OS_WINDOWS,"Windows")
+BOOST_PREDEF_DECLARE_TEST(BOOST_OS_WINDOWS,"Microsoft Windows")
 
 #endif

Modified: sandbox/predef/libs/predef/doc/html/index.html
==============================================================================
--- sandbox/predef/libs/predef/doc/html/index.html (original)
+++ sandbox/predef/libs/predef/doc/html/index.html 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -8,8 +8,6 @@
 <link rel="next" href="predef/introduction.html" title="Introduction">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr><td valign="top"></td></tr></table>
-<hr>
 <div class="spirit-nav"><a accesskey="n" href="predef/introduction.html"><img src="images/next.png" alt="Next"></a></div>
 <div class="article">
 <div class="titlepage">
@@ -61,7 +59,7 @@
 </table></div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"><p><small>Last revised: November 30, 2011 at 23:35:32 GMT</small></p></td>
+<td align="left"><p><small>Last revised: December 15, 2011 at 03:47:03 GMT</small></p></td>
 <td align="right"><div class="copyright-footer"></div></td>
 </tr></table>
 <hr>

Modified: sandbox/predef/libs/predef/doc/html/predef/adding_new_predefs.html
==============================================================================
--- sandbox/predef/libs/predef/doc/html/predef/adding_new_predefs.html (original)
+++ sandbox/predef/libs/predef/doc/html/predef/adding_new_predefs.html 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -10,8 +10,6 @@
 <link rel="next" href="reference.html" title="Reference">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr><td valign="top"></td></tr></table>
-<hr>
 <div class="spirit-nav">
 <a accesskey="p" href="using_the_predefs.html"><img src="../images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../images/home.png" alt="Home"></a><a accesskey="n" href="reference.html"><img src="../images/next.png" alt="Next"></a>
 </div>
@@ -82,8 +80,6 @@
       below, as current predef headers do. First we have the copyright and license
       statement, followed by the include guard:
     </p>
-<p>
-</p>
 <pre class="programlisting"><span class="comment">/*
 Copyright Jane Doe YYYY
 Distributed under the Boost Software License, Version 1.0.
@@ -95,21 +91,15 @@
 <span class="preprocessor">#define</span> <span class="identifier">BOOST_PREDEF_category_tag_H</span>
 </pre>
 <p>
- </p>
-<p>
       Depending on how you are defining the predef you will at minimum have to include
       the <code class="computeroutput"><span class="identifier">version_number</span><span class="special">.</span><span class="identifier">h</span></code> header. But you might also want to include
       the <code class="computeroutput"><span class="identifier">make</span><span class="special">.</span><span class="identifier">h</span></code> header for the version number decomposing
       utility macros:
     </p>
-<p>
-</p>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">predef</span><span class="special">/</span><span class="identifier">version_number</span><span class="special">.</span><span class="identifier">h</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">predef</span><span class="special">/</span><span class="identifier">make</span><span class="special">.</span><span class="identifier">h</span><span class="special">&gt;</span>
 </pre>
 <p>
- </p>
-<p>
       The Predef library uses Quickbook for documentation and for the individual
       predefs to appear in the reference section we add in-code documentation followed
       by the zero-value default definition of the predef macro. We strongly recommend
@@ -117,8 +107,6 @@
       some development environments automatically interpret this and provide in-line
       help for the macro. In particular this works for the popular Eclipse IDE:
     </p>
-<p>
-</p>
 <pre class="programlisting"><span class="comment">/*`
 [heading `BOOST_category_tag`]
 
@@ -128,8 +116,6 @@
 <span class="preprocessor">#define</span> <span class="identifier">BOOST_category_tag</span> <span class="identifier">BOOST_VERSION_NUMBER</span><span class="special">(</span><span class="number">0</span><span class="special">,</span><span class="number">0</span><span class="special">,</span><span class="number">0</span><span class="special">)</span>
 </pre>
 <p>
- </p>
-<p>
       Next is the detection and definition of the particular predef. The structure
       for this is to do a single overall check (<code class="computeroutput"><span class="identifier">condition_a</span></code>)
       and place the further version detection inside this. The first action inside
@@ -140,8 +126,6 @@
       <span class="identifier">BOOST_category_tag</span> <span class="identifier">BOOST_VERSION_NUMBER</span><span class="special">(</span><span class="number">0</span><span class="special">,</span><span class="number">0</span><span class="special">,</span><span class="number">1</span><span class="special">)</span></code>" as the fallback to minimally indicate
       that the predef was detected:
     </p>
-<p>
-</p>
 <pre class="programlisting"><span class="preprocessor">#if</span> <span class="special">(</span><span class="identifier">condition_a</span><span class="special">)</span>
     <span class="preprocessor">#undef</span> <span class="identifier">BOOST_category_tag</span>
     <span class="preprocessor">#if</span> <span class="special">(</span><span class="identifier">condition_b</span><span class="special">)</span>
@@ -152,29 +136,19 @@
 <span class="preprocessor">#endif</span>
 </pre>
 <p>
- </p>
-<p>
       The testing of the predef macros is automated to generate checks for all the
       defined predefs, whether detected or not. To do this we need to declare the
       predef to the test system. This declaration is empty for regular use. And during
       the test programs theexpand out specially to create informational output:
     </p>
-<p>
-</p>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">predef</span><span class="special">/</span><span class="identifier">detail</span><span class="special">/</span><span class="identifier">test</span><span class="special">.</span><span class="identifier">h</span><span class="special">&gt;</span>
 <span class="identifier">BOOST_PREDEF_DECLARE_TEST</span><span class="special">(</span><span class="identifier">BOOST_category_tag</span><span class="special">,</span><span class="string">"Name"</span><span class="special">)</span>
 </pre>
 <p>
- </p>
-<p>
       And, of course, we last need to close out the include guard:
     </p>
-<p>
-</p>
 <pre class="programlisting"><span class="preprocessor">#endif</span>
 </pre>
-<p>
- </p>
 <h4>
 <a name="predef.adding_new_predefs.h2"></a>
       <span><a name="predef.adding_new_predefs.using_utility_pattern_macros"></a></span><a class="link" href="adding_new_predefs.html#predef.adding_new_predefs.using_utility_pattern_macros">Using utility
@@ -183,24 +157,16 @@
 <p>
       By including:
     </p>
-<p>
-</p>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">predef</span><span class="special">/</span><span class="identifier">make</span><span class="special">.</span><span class="identifier">h</span><span class="special">&gt;</span>
 </pre>
 <p>
- </p>
-<p>
       One will get a set utlity macros to decompose common version macros as defined
       by compilers. For example the EDG compiler uses a simple 3-digit version macro
       (M,N,P). It can be decomesed and defined as:
     </p>
-<p>
-</p>
 <pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_CXX_EDG</span> <span class="identifier">BOOST_PREDEF_MAKE_N_N_N</span><span class="special">(</span><span class="identifier">__EDG_VERSION__</span><span class="special">)</span>
 </pre>
 <p>
- </p>
-<p>
       The decomposition macros are split into three types: decimal decomposition,
       hexadecimal decomposition, and date decomposition. They follow the format of
       using "N" for decimal, "F" for hexadecimal, and "Y",

Modified: sandbox/predef/libs/predef/doc/html/predef/introduction.html
==============================================================================
--- sandbox/predef/libs/predef/doc/html/predef/introduction.html (original)
+++ sandbox/predef/libs/predef/doc/html/predef/introduction.html 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -10,8 +10,6 @@
 <link rel="next" href="using_the_predefs.html" title="Using the predefs">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr><td valign="top"></td></tr></table>
-<hr>
 <div class="spirit-nav">
 <a accesskey="p" href="../index.html"><img src="../images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../images/home.png" alt="Home"></a><a accesskey="n" href="using_the_predefs.html"><img src="../images/next.png" alt="Next"></a>
 </div>

Modified: sandbox/predef/libs/predef/doc/html/predef/reference.html
==============================================================================
--- sandbox/predef/libs/predef/doc/html/predef/reference.html (original)
+++ sandbox/predef/libs/predef/doc/html/predef/reference.html 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -9,8 +9,6 @@
 <link rel="prev" href="adding_new_predefs.html" title="Adding new predefs">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr><td valign="top"></td></tr></table>
-<hr>
 <div class="spirit-nav">
 <a accesskey="p" href="adding_new_predefs.html"><img src="../images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../images/home.png" alt="Home"></a>
 </div>
@@ -169,233 +167,240 @@
         <span><a name="predef.reference.boost_cxx_compiler_macros.boost_cxx_borland"></a></span><a class="link" href="reference.html#predef.reference.boost_cxx_compiler_macros.boost_cxx_borland"><code class="computeroutput"><span class="identifier">BOOST_CXX_BORLAND</span></code></a>
       </h5>
 <p>
- Borland compiler. Version
- number available as major, minor, and patch.
+ Borland C++
+ compiler. Version number available as major, minor, and patch.
       </p>
 <h5>
 <a name="predef.reference.boost_cxx_compiler_macros.h1"></a>
- <span><a name="predef.reference.boost_cxx_compiler_macros.boost_cxx_como"></a></span><a class="link" href="reference.html#predef.reference.boost_cxx_compiler_macros.boost_cxx_como"><code class="computeroutput"><span class="identifier">BOOST_CXX_COMO</span></code></a>
+ <span><a name="predef.reference.boost_cxx_compiler_macros.boost_cxx_clang"></a></span><a class="link" href="reference.html#predef.reference.boost_cxx_compiler_macros.boost_cxx_clang"><code class="computeroutput"><span class="identifier">BOOST_CXX_CLANG</span></code></a>
       </h5>
 <p>
- Comeau compiler. Version
+ Clang compiler. Version
         number available as major, minor, and patch.
       </p>
 <h5>
 <a name="predef.reference.boost_cxx_compiler_macros.h2"></a>
- <span><a name="predef.reference.boost_cxx_compiler_macros.boost_cxx_dec"></a></span><a class="link" href="reference.html#predef.reference.boost_cxx_compiler_macros.boost_cxx_dec"><code class="computeroutput"><span class="identifier">BOOST_CXX_DEC</span></code></a>
+ <span><a name="predef.reference.boost_cxx_compiler_macros.boost_cxx_como"></a></span><a class="link" href="reference.html#predef.reference.boost_cxx_compiler_macros.boost_cxx_como"><code class="computeroutput"><span class="identifier">BOOST_CXX_COMO</span></code></a>
       </h5>
 <p>
- Compaq DEC compiler.
- Version number available as major, minor, and patch.
+ Comeau C++
+ compiler. Version number available as major, minor, and patch.
       </p>
 <h5>
 <a name="predef.reference.boost_cxx_compiler_macros.h3"></a>
+ <span><a name="predef.reference.boost_cxx_compiler_macros.boost_cxx_dec"></a></span><a class="link" href="reference.html#predef.reference.boost_cxx_compiler_macros.boost_cxx_dec"><code class="computeroutput"><span class="identifier">BOOST_CXX_DEC</span></code></a>
+ </h5>
+<p>
+ <a href="http://www.openvms.compaq.com/openvms/brochures/deccplus/" target="_top">Compaq
+ C/C++</a> compiler. Version number available as major, minor, and patch.
+ </p>
+<h5>
+<a name="predef.reference.boost_cxx_compiler_macros.h4"></a>
         <span><a name="predef.reference.boost_cxx_compiler_macros.boost_cxx_cygwin"></a></span><a class="link" href="reference.html#predef.reference.boost_cxx_compiler_macros.boost_cxx_cygwin"><code class="computeroutput"><span class="identifier">BOOST_CXX_CYGWIN</span></code></a>
       </h5>
 <p>
         <a href="http://en.wikipedia.org/wiki/XXX" target="_top">Cygwin</a> compiler.
       </p>
 <h5>
-<a name="predef.reference.boost_cxx_compiler_macros.h4"></a>
+<a name="predef.reference.boost_cxx_compiler_macros.h5"></a>
         <span><a name="predef.reference.boost_cxx_compiler_macros.boost_cxx_diab"></a></span><a class="link" href="reference.html#predef.reference.boost_cxx_compiler_macros.boost_cxx_diab"><code class="computeroutput"><span class="identifier">BOOST_CXX_DIAB</span></code></a>
       </h5>
 <p>
- Diab compiler. Version
- number available as major, minor, and patch.
+ <a href="http://www.windriver.com/products/development_suite/wind_river_compiler/" target="_top">Diab
+ C/C++</a> compiler. Version number available as major, minor, and patch.
       </p>
 <h5>
-<a name="predef.reference.boost_cxx_compiler_macros.h5"></a>
+<a name="predef.reference.boost_cxx_compiler_macros.h6"></a>
         <span><a name="predef.reference.boost_cxx_compiler_macros.boost_cxx_dmc"></a></span><a class="link" href="reference.html#predef.reference.boost_cxx_compiler_macros.boost_cxx_dmc"><code class="computeroutput"><span class="identifier">BOOST_CXX_DMC</span></code></a>
       </h5>
 <p>
- Digital Mars compiler.
- Version number available as major, minor, and patch.
+ Digital Mars
+ compiler. Version number available as major, minor, and patch.
       </p>
 <h5>
-<a name="predef.reference.boost_cxx_compiler_macros.h6"></a>
+<a name="predef.reference.boost_cxx_compiler_macros.h7"></a>
         <span><a name="predef.reference.boost_cxx_compiler_macros.boost_cxx_sysc"></a></span><a class="link" href="reference.html#predef.reference.boost_cxx_compiler_macros.boost_cxx_sysc"><code class="computeroutput"><span class="identifier">BOOST_CXX_SYSC</span></code></a>
       </h5>
 <p>
- Dignus SysC compiler.
+ Dignus Systems/C++ compiler.
         Version number available as major, minor, and patch.
       </p>
 <h5>
-<a name="predef.reference.boost_cxx_compiler_macros.h7"></a>
+<a name="predef.reference.boost_cxx_compiler_macros.h8"></a>
         <span><a name="predef.reference.boost_cxx_compiler_macros.boost_cxx_edg"></a></span><a class="link" href="reference.html#predef.reference.boost_cxx_compiler_macros.boost_cxx_edg"><code class="computeroutput"><span class="identifier">BOOST_CXX_EDG</span></code></a>
       </h5>
 <p>
- EDG compiler. Version
- number available as major, minor, and patch.
+ EDG C++ Frontend
+ compiler. Version number available as major, minor, and patch.
       </p>
 <h5>
-<a name="predef.reference.boost_cxx_compiler_macros.h8"></a>
+<a name="predef.reference.boost_cxx_compiler_macros.h9"></a>
         <span><a name="predef.reference.boost_cxx_compiler_macros.boost_cxx_path"></a></span><a class="link" href="reference.html#predef.reference.boost_cxx_compiler_macros.boost_cxx_path"><code class="computeroutput"><span class="identifier">BOOST_CXX_PATH</span></code></a>
       </h5>
 <p>
- Ekopath compiler. Version
- number available as major, minor, and patch.
+ EKOpath compiler.
+ Version number available as major, minor, and patch.
       </p>
 <h5>
-<a name="predef.reference.boost_cxx_compiler_macros.h9"></a>
+<a name="predef.reference.boost_cxx_compiler_macros.h10"></a>
         <span><a name="predef.reference.boost_cxx_compiler_macros.boost_cxx_gnuc"></a></span><a class="link" href="reference.html#predef.reference.boost_cxx_compiler_macros.boost_cxx_gnuc"><code class="computeroutput"><span class="identifier">BOOST_CXX_GNUC</span></code></a>
       </h5>
 <p>
- Gnu C/C++ compiler.
- Version number available as major, minor, and patch (if available).
+ <a href="http://en.wikipedia.org/wiki/GNU_Compiler_Collection" target="_top">Gnu GCC
+ C/C++</a> compiler. Version number available as major, minor, and patch
+ (if available).
       </p>
 <h5>
-<a name="predef.reference.boost_cxx_compiler_macros.h10"></a>
+<a name="predef.reference.boost_cxx_compiler_macros.h11"></a>
         <span><a name="predef.reference.boost_cxx_compiler_macros.boost_cxx_gccxml"></a></span><a class="link" href="reference.html#predef.reference.boost_cxx_compiler_macros.boost_cxx_gccxml"><code class="computeroutput"><span class="identifier">BOOST_CXX_GCCXML</span></code></a>
       </h5>
 <p>
         <a href="http://en.wikipedia.org/wiki/XXX" target="_top">GCC XML</a> compiler.
       </p>
 <h5>
-<a name="predef.reference.boost_cxx_compiler_macros.h11"></a>
+<a name="predef.reference.boost_cxx_compiler_macros.h12"></a>
         <span><a name="predef.reference.boost_cxx_compiler_macros.boost_cxx_ghs"></a></span><a class="link" href="reference.html#predef.reference.boost_cxx_compiler_macros.boost_cxx_ghs"><code class="computeroutput"><span class="identifier">BOOST_CXX_GHS</span></code></a>
       </h5>
 <p>
- Green Hills compiler.
- Version number available as major, minor, and patch.
+ <a href="http://en.wikipedia.org/wiki/Green_Hills_Software" target="_top">Green Hills
+ C/C++</a> compiler. Version number available as major, minor, and patch.
       </p>
 <h5>
-<a name="predef.reference.boost_cxx_compiler_macros.h12"></a>
+<a name="predef.reference.boost_cxx_compiler_macros.h13"></a>
         <span><a name="predef.reference.boost_cxx_compiler_macros.boost_cxx_hpacc"></a></span><a class="link" href="reference.html#predef.reference.boost_cxx_compiler_macros.boost_cxx_hpacc"><code class="computeroutput"><span class="identifier">BOOST_CXX_HPACC</span></code></a>
       </h5>
 <p>
- HP ACC compiler. Version
- number available as major, minor, and patch.
+ HP aC++ compiler. Version number available as major, minor, and patch.
       </p>
 <h5>
-<a name="predef.reference.boost_cxx_compiler_macros.h13"></a>
+<a name="predef.reference.boost_cxx_compiler_macros.h14"></a>
         <span><a name="predef.reference.boost_cxx_compiler_macros.boost_cxx_iar"></a></span><a class="link" href="reference.html#predef.reference.boost_cxx_compiler_macros.boost_cxx_iar"><code class="computeroutput"><span class="identifier">BOOST_CXX_IAR</span></code></a>
       </h5>
 <p>
- IAR compiler. Version
- number available as major, minor, and patch.
+ IAR C/C++ compiler. Version number available as major, minor, and patch.
       </p>
 <h5>
-<a name="predef.reference.boost_cxx_compiler_macros.h14"></a>
+<a name="predef.reference.boost_cxx_compiler_macros.h15"></a>
         <span><a name="predef.reference.boost_cxx_compiler_macros.boost_cxx_ibm"></a></span><a class="link" href="reference.html#predef.reference.boost_cxx_compiler_macros.boost_cxx_ibm"><code class="computeroutput"><span class="identifier">BOOST_CXX_IBM</span></code></a>
       </h5>
 <p>
- Iternational Business Mchines
+ IBM XL C/C++
         compiler. Version number available as major, minor, and patch.
       </p>
 <h5>
-<a name="predef.reference.boost_cxx_compiler_macros.h15"></a>
+<a name="predef.reference.boost_cxx_compiler_macros.h16"></a>
         <span><a name="predef.reference.boost_cxx_compiler_macros.boost_cxx_intel"></a></span><a class="link" href="reference.html#predef.reference.boost_cxx_compiler_macros.boost_cxx_intel"><code class="computeroutput"><span class="identifier">BOOST_CXX_INTEL</span></code></a>
       </h5>
 <p>
- Intel compiler. Version
- number available as major, minor, and patch.
+ Intel C/C++
+ compiler. Version number available as major, minor, and patch.
       </p>
 <h5>
-<a name="predef.reference.boost_cxx_compiler_macros.h16"></a>
+<a name="predef.reference.boost_cxx_compiler_macros.h17"></a>
         <span><a name="predef.reference.boost_cxx_compiler_macros.boost_cxx_kcc"></a></span><a class="link" href="reference.html#predef.reference.boost_cxx_compiler_macros.boost_cxx_kcc"><code class="computeroutput"><span class="identifier">BOOST_CXX_KCC</span></code></a>
       </h5>
 <p>
- Kai compiler. Version
- number available as major, minor, and patch.
+ Kai C++ compiler. Version number available as major, minor, and patch.
       </p>
 <h5>
-<a name="predef.reference.boost_cxx_compiler_macros.h17"></a>
+<a name="predef.reference.boost_cxx_compiler_macros.h18"></a>
         <span><a name="predef.reference.boost_cxx_compiler_macros.boost_cxx_llvm"></a></span><a class="link" href="reference.html#predef.reference.boost_cxx_compiler_macros.boost_cxx_llvm"><code class="computeroutput"><span class="identifier">BOOST_CXX_LLVM</span></code></a>
       </h5>
 <p>
- LLVM compiler.
+ LLVM compiler.
       </p>
 <h5>
-<a name="predef.reference.boost_cxx_compiler_macros.h18"></a>
+<a name="predef.reference.boost_cxx_compiler_macros.h19"></a>
         <span><a name="predef.reference.boost_cxx_compiler_macros.boost_cxx_highc"></a></span><a class="link" href="reference.html#predef.reference.boost_cxx_compiler_macros.boost_cxx_highc"><code class="computeroutput"><span class="identifier">BOOST_CXX_HIGHC</span></code></a>
       </h5>
 <p>
- Metaware HighC compiler.
+ MetaWare High C/C++ compiler.
       </p>
 <h5>
-<a name="predef.reference.boost_cxx_compiler_macros.h19"></a>
+<a name="predef.reference.boost_cxx_compiler_macros.h20"></a>
         <span><a name="predef.reference.boost_cxx_compiler_macros.boost_cxx_mwerks"></a></span><a class="link" href="reference.html#predef.reference.boost_cxx_compiler_macros.boost_cxx_mwerks"><code class="computeroutput"><span class="identifier">BOOST_CXX_MWERKS</span></code></a>
       </h5>
 <p>
- Metrowerks compiler.
- Version number available as major, minor, and patch.
+ Metrowerks CodeWarrior
+ compiler. Version number available as major, minor, and patch.
       </p>
 <h5>
-<a name="predef.reference.boost_cxx_compiler_macros.h20"></a>
+<a name="predef.reference.boost_cxx_compiler_macros.h21"></a>
         <span><a name="predef.reference.boost_cxx_compiler_macros.boost_cxx_mri"></a></span><a class="link" href="reference.html#predef.reference.boost_cxx_compiler_macros.boost_cxx_mri"><code class="computeroutput"><span class="identifier">BOOST_CXX_MRI</span></code></a>
       </h5>
 <p>
- Microtec compiler.
+ Microtec C/C++ compiler.
       </p>
 <h5>
-<a name="predef.reference.boost_cxx_compiler_macros.h21"></a>
+<a name="predef.reference.boost_cxx_compiler_macros.h22"></a>
         <span><a name="predef.reference.boost_cxx_compiler_macros.boost_cxx_mingw"></a></span><a class="link" href="reference.html#predef.reference.boost_cxx_compiler_macros.boost_cxx_mingw"><code class="computeroutput"><span class="identifier">BOOST_CXX_MINGW</span></code></a>
       </h5>
 <p>
- MinGW compiler. Version
+ MinGW compiler. Version
         number available as major, minor, and patch.
       </p>
 <h5>
-<a name="predef.reference.boost_cxx_compiler_macros.h22"></a>
+<a name="predef.reference.boost_cxx_compiler_macros.h23"></a>
         <span><a name="predef.reference.boost_cxx_compiler_macros.boost_cxx_mpw"></a></span><a class="link" href="reference.html#predef.reference.boost_cxx_compiler_macros.boost_cxx_mpw"><code class="computeroutput"><span class="identifier">BOOST_CXX_MPW</span></code></a>
       </h5>
 <p>
- MPW compiler. Version
- number available as major, and minor.
+ <a href="http://en.wikipedia.org/wiki/Macintosh_Programmer%27s_Workshop" target="_top">MPW
+ C++</a> compiler. Version number available as major, and minor.
       </p>
 <h5>
-<a name="predef.reference.boost_cxx_compiler_macros.h23"></a>
+<a name="predef.reference.boost_cxx_compiler_macros.h24"></a>
         <span><a name="predef.reference.boost_cxx_compiler_macros.boost_cxx_palm"></a></span><a class="link" href="reference.html#predef.reference.boost_cxx_compiler_macros.boost_cxx_palm"><code class="computeroutput"><span class="identifier">BOOST_CXX_PALM</span></code></a>
       </h5>
 <p>
- Palm compiler. Version
- number available as major, minor, and patch.
+ Palm C/C++ compiler. Version number available as major, minor, and patch.
       </p>
 <h5>
-<a name="predef.reference.boost_cxx_compiler_macros.h24"></a>
+<a name="predef.reference.boost_cxx_compiler_macros.h25"></a>
         <span><a name="predef.reference.boost_cxx_compiler_macros.boost_cxx_pgi"></a></span><a class="link" href="reference.html#predef.reference.boost_cxx_compiler_macros.boost_cxx_pgi"><code class="computeroutput"><span class="identifier">BOOST_CXX_PGI</span></code></a>
       </h5>
 <p>
- PGI compiler.
+ <a href="http://en.wikipedia.org/wiki/The_Portland_Group" target="_top">Portland Group
+ C/C++</a> compiler.
       </p>
 <h5>
-<a name="predef.reference.boost_cxx_compiler_macros.h25"></a>
+<a name="predef.reference.boost_cxx_compiler_macros.h26"></a>
         <span><a name="predef.reference.boost_cxx_compiler_macros.boost_cxx_sgi"></a></span><a class="link" href="reference.html#predef.reference.boost_cxx_compiler_macros.boost_cxx_sgi"><code class="computeroutput"><span class="identifier">BOOST_CXX_SGI</span></code></a>
       </h5>
 <p>
- SGI Mips-pro compiler.
+ SGI MIPSpro compiler.
         Version number available as major, minor, and patch.
       </p>
 <h5>
-<a name="predef.reference.boost_cxx_compiler_macros.h26"></a>
+<a name="predef.reference.boost_cxx_compiler_macros.h27"></a>
         <span><a name="predef.reference.boost_cxx_compiler_macros.boost_cxx_sunpro"></a></span><a class="link" href="reference.html#predef.reference.boost_cxx_compiler_macros.boost_cxx_sunpro"><code class="computeroutput"><span class="identifier">BOOST_CXX_SUNPRO</span></code></a>
       </h5>
 <p>
- Sun Pro compiler. Version
- number available as major, minor, and patch.
+ Sun Studio
+ compiler. Version number available as major, minor, and patch.
       </p>
 <h5>
-<a name="predef.reference.boost_cxx_compiler_macros.h27"></a>
+<a name="predef.reference.boost_cxx_compiler_macros.h28"></a>
         <span><a name="predef.reference.boost_cxx_compiler_macros.boost_cxx_tendra"></a></span><a class="link" href="reference.html#predef.reference.boost_cxx_compiler_macros.boost_cxx_tendra"><code class="computeroutput"><span class="identifier">BOOST_CXX_TENDRA</span></code></a>
       </h5>
 <p>
- Tendra compiler.
+ TenDRA C/C++
+ compiler.
       </p>
 <h5>
-<a name="predef.reference.boost_cxx_compiler_macros.h28"></a>
+<a name="predef.reference.boost_cxx_compiler_macros.h29"></a>
         <span><a name="predef.reference.boost_cxx_compiler_macros.boost_cxx_msvc"></a></span><a class="link" href="reference.html#predef.reference.boost_cxx_compiler_macros.boost_cxx_msvc"><code class="computeroutput"><span class="identifier">BOOST_CXX_MSVC</span></code></a>
       </h5>
 <p>
- Microsoft Visual C/C++
- compiler. Version number available as major, minor, and patch.
+ <a href="http://en.wikipedia.org/wiki/Visual_studio" target="_top">Microsoft Visual
+ C/C++</a> compiler. Version number available as major, minor, and patch.
       </p>
 <h5>
-<a name="predef.reference.boost_cxx_compiler_macros.h29"></a>
+<a name="predef.reference.boost_cxx_compiler_macros.h30"></a>
         <span><a name="predef.reference.boost_cxx_compiler_macros.boost_cxx_watcom"></a></span><a class="link" href="reference.html#predef.reference.boost_cxx_compiler_macros.boost_cxx_watcom"><code class="computeroutput"><span class="identifier">BOOST_CXX_WATCOM</span></code></a>
       </h5>
 <p>
- Watcom compiler. Version
- number available as major, and minor.
+ Watcom C++ compiler.
+ Version number available as major, and minor.
       </p>
 </div>
 <div class="section">
@@ -626,15 +631,15 @@
         <span><a name="predef.reference.boost_libc_and_boost_libstd_libr.boost_libstd_rw"></a></span><a class="link" href="reference.html#predef.reference.boost_libc_and_boost_libstd_libr.boost_libstd_rw"><code class="computeroutput"><span class="identifier">BOOST_LIBSTD_RW</span></code></a>
       </h5>
 <p>
- Roguewave Standard C++
- library. If available version number as major, minor, and patch.
+ Roguewave Standard C++ library.
+ If available version number as major, minor, and patch.
       </p>
 <h5>
 <a name="predef.reference.boost_libc_and_boost_libstd_libr.h10"></a>
         <span><a name="predef.reference.boost_libc_and_boost_libstd_libr.boost_libstd_sgi"></a></span><a class="link" href="reference.html#predef.reference.boost_libc_and_boost_libstd_libr.boost_libstd_sgi"><code class="computeroutput"><span class="identifier">BOOST_LIBSTD_SGI</span></code></a>
       </h5>
 <p>
- SGI Standard C++ library.
+ SGI Standard C++ library.
         If available version number as major, minor, and patch.
       </p>
 <h5>
@@ -650,7 +655,7 @@
         <span><a name="predef.reference.boost_libc_and_boost_libstd_libr.boost_libstd_stlport"></a></span><a class="link" href="reference.html#predef.reference.boost_libc_and_boost_libstd_libr.boost_libstd_stlport"><code class="computeroutput"><span class="identifier">BOOST_LIBSTD_STLPORT</span></code></a>
       </h5>
 <p>
- STLport Standard C++
+ STLport Standard C++
         library. Version number available as major, minor, and patch.
       </p>
 <h5>
@@ -658,8 +663,8 @@
         <span><a name="predef.reference.boost_libc_and_boost_libstd_libr.boost_libstd_ibm"></a></span><a class="link" href="reference.html#predef.reference.boost_libc_and_boost_libstd_libr.boost_libstd_ibm"><code class="computeroutput"><span class="identifier">BOOST_LIBSTD_IBM</span></code></a>
       </h5>
 <p>
- IBM VACPP Standard C++
- library.
+ <a href="http://www.ibm.com/software/awdtools/xlcpp/" target="_top">IBM VACPP Standard
+ C++</a> library.
       </p>
 </div>
 <div class="section">
@@ -668,32 +673,34 @@
 </h3></div></div></div>
 <h5>
 <a name="predef.reference.boost_os_operating_system_macros.h0"></a>
- <span><a name="predef.reference.boost_os_operating_system_macros.boost_os"></a></span><a class="link" href="reference.html#predef.reference.boost_os_operating_system_macros.boost_os"><code class="computeroutput"><span class="identifier">BOOST_OS_</span></code></a>
+ <span><a name="predef.reference.boost_os_operating_system_macros.boost_os_aix"></a></span><a class="link" href="reference.html#predef.reference.boost_os_operating_system_macros.boost_os_aix"><code class="computeroutput"><span class="identifier">BOOST_OS_AIX</span></code></a>
       </h5>
 <p>
- AIX operating system.
- Version number available as major, minor, and patch.
+ IBM AIX
+ operating system. Version number available as major, minor, and patch.
       </p>
 <h5>
 <a name="predef.reference.boost_os_operating_system_macros.h1"></a>
         <span><a name="predef.reference.boost_os_operating_system_macros.boost_os_amigaos"></a></span><a class="link" href="reference.html#predef.reference.boost_os_operating_system_macros.boost_os_amigaos"><code class="computeroutput"><span class="identifier">BOOST_OS_AMIGAOS</span></code></a>
       </h5>
 <p>
- AmigaOS operating system.
+ AmigaOS operating
+ system.
       </p>
 <h5>
 <a name="predef.reference.boost_os_operating_system_macros.h2"></a>
         <span><a name="predef.reference.boost_os_operating_system_macros.boost_os_beos"></a></span><a class="link" href="reference.html#predef.reference.boost_os_operating_system_macros.boost_os_beos"><code class="computeroutput"><span class="identifier">BOOST_OS_BEOS</span></code></a>
       </h5>
 <p>
- Be operating system.
+ BeOS operating system.
       </p>
 <h5>
 <a name="predef.reference.boost_os_operating_system_macros.h3"></a>
         <span><a name="predef.reference.boost_os_operating_system_macros.boost_os_bsd"></a></span><a class="link" href="reference.html#predef.reference.boost_os_operating_system_macros.boost_os_bsd"><code class="computeroutput"><span class="identifier">BOOST_OS_BSD</span></code></a>
       </h5>
 <p>
- BSD operating system.
+ BSD
+ operating system.
       </p>
 <p>
         BSD has various branch operating systems possible and each detected individually.
@@ -703,19 +710,19 @@
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
             <code class="computeroutput"><span class="identifier">BOOST_OS_DRAGONFLY_BSD</span></code>
- Dragonfly BSD
+ DragonFly BSD
           </li>
 <li class="listitem">
- <code class="computeroutput"><span class="identifier">BOOST_OS_FREE_BSD</span></code> Free BSD
+ <code class="computeroutput"><span class="identifier">BOOST_OS_FREE_BSD</span></code> FreeBSD
           </li>
 <li class="listitem">
- <code class="computeroutput"><span class="identifier">BOOST_OS_BSDI_BSD</span></code> BSDI
+ <code class="computeroutput"><span class="identifier">BOOST_OS_BSDI_BSD</span></code> BSDi BSD/OS
           </li>
 <li class="listitem">
- <code class="computeroutput"><span class="identifier">BOOST_OS_NET_BSD</span></code> Net BSD
+ <code class="computeroutput"><span class="identifier">BOOST_OS_NET_BSD</span></code> NetBSD
           </li>
 <li class="listitem">
- <code class="computeroutput"><span class="identifier">BOOST_OS_OPEN_BSD</span></code> Open BSD
+ <code class="computeroutput"><span class="identifier">BOOST_OS_OPEN_BSD</span></code> OpenBSD
           </li>
 </ul></div>
 <div class="note"><table border="0" summary="Note">
@@ -734,67 +741,93 @@
         <span><a name="predef.reference.boost_os_operating_system_macros.boost_os_cygwin"></a></span><a class="link" href="reference.html#predef.reference.boost_os_operating_system_macros.boost_os_cygwin"><code class="computeroutput"><span class="identifier">BOOST_OS_CYGWIN</span></code></a>
       </h5>
 <p>
- Cygwin operating system.
+ Cygwin evironment.
       </p>
 <h5>
 <a name="predef.reference.boost_os_operating_system_macros.h5"></a>
         <span><a name="predef.reference.boost_os_operating_system_macros.boost_os_hpux"></a></span><a class="link" href="reference.html#predef.reference.boost_os_operating_system_macros.boost_os_hpux"><code class="computeroutput"><span class="identifier">BOOST_OS_HPUX</span></code></a>
       </h5>
 <p>
- HP-UX operating system.
+ HP-UX operating system.
       </p>
 <h5>
 <a name="predef.reference.boost_os_operating_system_macros.h6"></a>
         <span><a name="predef.reference.boost_os_operating_system_macros.boost_os_irix"></a></span><a class="link" href="reference.html#predef.reference.boost_os_operating_system_macros.boost_os_irix"><code class="computeroutput"><span class="identifier">BOOST_OS_IRIX</span></code></a>
       </h5>
 <p>
- Irix operating system.
+ IRIX operating system.
       </p>
 <h5>
 <a name="predef.reference.boost_os_operating_system_macros.h7"></a>
         <span><a name="predef.reference.boost_os_operating_system_macros.boost_os_linux"></a></span><a class="link" href="reference.html#predef.reference.boost_os_operating_system_macros.boost_os_linux"><code class="computeroutput"><span class="identifier">BOOST_OS_LINUX</span></code></a>
       </h5>
 <p>
- Linux operating system.
+ Linux operating system.
       </p>
 <h5>
 <a name="predef.reference.boost_os_operating_system_macros.h8"></a>
         <span><a name="predef.reference.boost_os_operating_system_macros.boost_os_macos"></a></span><a class="link" href="reference.html#predef.reference.boost_os_operating_system_macros.boost_os_macos"><code class="computeroutput"><span class="identifier">BOOST_OS_MACOS</span></code></a>
       </h5>
 <p>
- MacOS operating system.
- Versions [9-10] are specifically detected.
+ Mac OS operating
+ system. Versions [9-10] are specifically detected.
       </p>
 <h5>
 <a name="predef.reference.boost_os_operating_system_macros.h9"></a>
+ <span><a name="predef.reference.boost_os_operating_system_macros.boost_os_os400"></a></span><a class="link" href="reference.html#predef.reference.boost_os_operating_system_macros.boost_os_os400"><code class="computeroutput"><span class="identifier">BOOST_OS_OS400</span></code></a>
+ </h5>
+<p>
+ IBM OS/400 operating
+ system.
+ </p>
+<h5>
+<a name="predef.reference.boost_os_operating_system_macros.h10"></a>
         <span><a name="predef.reference.boost_os_operating_system_macros.boost_os_qnx"></a></span><a class="link" href="reference.html#predef.reference.boost_os_operating_system_macros.boost_os_qnx"><code class="computeroutput"><span class="identifier">BOOST_OS_QNX</span></code></a>
       </h5>
 <p>
- QNX-NTO operating system.
+ QNX operating system.
         Version number available as major, and minor if possible. And version 4 is
         specifically detected.
       </p>
 <h5>
-<a name="predef.reference.boost_os_operating_system_macros.h10"></a>
+<a name="predef.reference.boost_os_operating_system_macros.h11"></a>
         <span><a name="predef.reference.boost_os_operating_system_macros.boost_os_solaris"></a></span><a class="link" href="reference.html#predef.reference.boost_os_operating_system_macros.boost_os_solaris"><code class="computeroutput"><span class="identifier">BOOST_OS_SOLARIS</span></code></a>
       </h5>
 <p>
- Solaris operating system.
+ Solaris
+ operating system.
       </p>
 <h5>
-<a name="predef.reference.boost_os_operating_system_macros.h11"></a>
+<a name="predef.reference.boost_os_operating_system_macros.h12"></a>
         <span><a name="predef.reference.boost_os_operating_system_macros.boost_os_unix"></a></span><a class="link" href="reference.html#predef.reference.boost_os_operating_system_macros.boost_os_unix"><code class="computeroutput"><span class="identifier">BOOST_OS_UNIX</span></code></a>
       </h5>
 <p>
- Unix operating system.
+ Unix Environment operating
+ system.
       </p>
 <h5>
-<a name="predef.reference.boost_os_operating_system_macros.h12"></a>
+<a name="predef.reference.boost_os_operating_system_macros.h13"></a>
+ <span><a name="predef.reference.boost_os_operating_system_macros.boost_os_svr4"></a></span><a class="link" href="reference.html#predef.reference.boost_os_operating_system_macros.boost_os_svr4"><code class="computeroutput"><span class="identifier">BOOST_OS_SVR4</span></code></a>
+ </h5>
+<p>
+ SVR4 Environment
+ operating system.
+ </p>
+<h5>
+<a name="predef.reference.boost_os_operating_system_macros.h14"></a>
+ <span><a name="predef.reference.boost_os_operating_system_macros.boost_os_vms"></a></span><a class="link" href="reference.html#predef.reference.boost_os_operating_system_macros.boost_os_vms"><code class="computeroutput"><span class="identifier">BOOST_OS_VMS</span></code></a>
+ </h5>
+<p>
+ VMS operating system.
+ Version number available as major, minor, and patch.
+ </p>
+<h5>
+<a name="predef.reference.boost_os_operating_system_macros.h15"></a>
         <span><a name="predef.reference.boost_os_operating_system_macros.boost_os_windows"></a></span><a class="link" href="reference.html#predef.reference.boost_os_operating_system_macros.boost_os_windows"><code class="computeroutput"><span class="identifier">BOOST_OS_WINDOWS</span></code></a>
       </h5>
 <p>
- Microsoft Windows operating
- system.
+ <a href="http://en.wikipedia.org/wiki/Category:Microsoft_Windows" target="_top">Microsoft
+ Windows</a> operating system.
       </p>
 </div>
 <div class="section">
@@ -806,13 +839,9 @@
 <a name="predef.reference.version_definition_macros.h0"></a>
         <span><a name="predef.reference.version_definition_macros.boost_version_number"></a></span><a class="link" href="reference.html#predef.reference.version_definition_macros.boost_version_number"><code class="computeroutput"><span class="identifier">BOOST_VERSION_NUMBER</span></code></a>
       </h5>
-<p>
-</p>
 <pre class="programlisting"><span class="identifier">BOOST_VERSION_NUMBER</span><span class="special">(</span><span class="identifier">major</span><span class="special">,</span><span class="identifier">minor</span><span class="special">,</span><span class="identifier">patch</span><span class="special">)</span>
 </pre>
 <p>
- </p>
-<p>
         Defines standard version numbers, with these properties:
       </p>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
@@ -894,31 +923,43 @@
         Macros are:
       </p>
 <p>
- <code class="computeroutput"><span class="identifier">BOOST_PREDEF_MAKE_N_N_N</span><span class="special">(</span><span class="identifier">V</span><span class="special">)</span></code>
+ <code class="computeroutput"><span class="identifier">BOOST_PREDEF_MAKE_N__NNN</span><span class="special">(</span><span class="identifier">V</span><span class="special">)</span></code>
       </p>
 <p>
- <code class="computeroutput"><span class="identifier">BOOST_PREDEF_MAKE_NN_NN_NN</span><span class="special">(</span><span class="identifier">V</span><span class="special">)</span></code>
+ <code class="computeroutput"><span class="identifier">BOOST_PREDEF_MAKE_N_N_N</span><span class="special">(</span><span class="identifier">V</span><span class="special">)</span></code>
       </p>
 <p>
- <code class="computeroutput"><span class="identifier">BOOST_PREDEF_MAKE_NN_NN</span><span class="special">(</span><span class="identifier">V</span><span class="special">)</span></code>
+ <code class="computeroutput"><span class="identifier">BOOST_PREDEF_MAKE_N_N_N_000</span><span class="special">(</span><span class="identifier">V</span><span class="special">)</span></code>
       </p>
 <p>
         <code class="computeroutput"><span class="identifier">BOOST_PREDEF_MAKE_N_N_NN</span><span class="special">(</span><span class="identifier">V</span><span class="special">)</span></code>
       </p>
 <p>
- <code class="computeroutput"><span class="identifier">BOOST_PREDEF_MAKE_N_NN_NN</span><span class="special">(</span><span class="identifier">V</span><span class="special">)</span></code>
+ <code class="computeroutput"><span class="identifier">BOOST_PREDEF_MAKE_N_NN</span><span class="special">(</span><span class="identifier">V</span><span class="special">)</span></code>
       </p>
 <p>
- <code class="computeroutput"><span class="identifier">BOOST_PREDEF_MAKE_N_N_N_000</span><span class="special">(</span><span class="identifier">V</span><span class="special">)</span></code>
+ <code class="computeroutput"><span class="identifier">BOOST_PREDEF_MAKE_N_NN_NN</span><span class="special">(</span><span class="identifier">V</span><span class="special">)</span></code>
       </p>
 <p>
         <code class="computeroutput"><span class="identifier">BOOST_PREDEF_MAKE_N_NN_000</span><span class="special">(</span><span class="identifier">V</span><span class="special">)</span></code>
       </p>
 <p>
- <code class="computeroutput"><span class="identifier">BOOST_PREDEF_MAKE_NN_NN_00_NN_00</span><span class="special">(</span><span class="identifier">V</span><span class="special">)</span></code>
+ <code class="computeroutput"><span class="identifier">BOOST_PREDEF_MAKE_NN_00</span><span class="special">(</span><span class="identifier">V</span><span class="special">)</span></code>
       </p>
 <p>
- <code class="computeroutput"><span class="identifier">BOOST_PREDEF_MAKE_NN_00</span><span class="special">(</span><span class="identifier">V</span><span class="special">)</span></code>
+ <code class="computeroutput"><span class="identifier">BOOST_PREDEF_MAKE_NN_NN</span><span class="special">(</span><span class="identifier">V</span><span class="special">)</span></code>
+ </p>
+<p>
+ <code class="computeroutput"><span class="identifier">BOOST_PREDEF_MAKE_NN_NN_NN</span><span class="special">(</span><span class="identifier">V</span><span class="special">)</span></code>
+ </p>
+<p>
+ <code class="computeroutput"><span class="identifier">BOOST_PREDEF_MAKE_NN_NN_0_NN_00</span><span class="special">(</span><span class="identifier">V</span><span class="special">)</span></code>
+ </p>
+<p>
+ <code class="computeroutput"><span class="identifier">BOOST_PREDEF_MAKE_NN_NN_0_NNNN</span><span class="special">(</span><span class="identifier">V</span><span class="special">)</span></code>
+ </p>
+<p>
+ <code class="computeroutput"><span class="identifier">BOOST_PREDEF_MAKE_NN_NN_00_NN_00</span><span class="special">(</span><span class="identifier">V</span><span class="special">)</span></code>
       </p>
 <p>
         <code class="computeroutput"><span class="identifier">BOOST_PREDEF_MAKE_YYYY_MM_DD</span><span class="special">(</span><span class="identifier">V</span><span class="special">)</span></code>

Modified: sandbox/predef/libs/predef/doc/html/predef/using_the_predefs.html
==============================================================================
--- sandbox/predef/libs/predef/doc/html/predef/using_the_predefs.html (original)
+++ sandbox/predef/libs/predef/doc/html/predef/using_the_predefs.html 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -10,8 +10,6 @@
 <link rel="next" href="adding_new_predefs.html" title="Adding new predefs">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr><td valign="top"></td></tr></table>
-<hr>
 <div class="spirit-nav">
 <a accesskey="p" href="introduction.html"><img src="../images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../images/home.png" alt="Home"></a><a accesskey="n" href="adding_new_predefs.html"><img src="../images/next.png" alt="Next"></a>
 </div>
@@ -23,13 +21,9 @@
       To use the automatically defined predefs one needs to only include the single
       top-level header:
     </p>
-<p>
-</p>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">predef</span><span class="special">.</span><span class="identifier">h</span><span class="special">&gt;</span>
 </pre>
 <p>
- </p>
-<p>
       This defines <span class="bold"><strong>all</strong></span> the version macros known
       to the library. For each macro it will be defined to either a <span class="emphasis"><em>zero</em></span>
       valued expression for when the particular item is not detected, and to a <span class="emphasis"><em>positive</em></span>
@@ -75,8 +69,6 @@
       macro. For example, to make a choice based on the version of the GCC C++ compiler
       one would:
     </p>
-<p>
-</p>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">predef</span><span class="special">.</span><span class="identifier">h</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">iostream</span><span class="special">&gt;</span>
 
@@ -90,16 +82,12 @@
 <span class="special">}</span>
 </pre>
 <p>
- </p>
-<p>
       As you might notice above the <code class="computeroutput"><span class="keyword">else</span></code>
       clause also covers the case where we the particular compiler is not detected.
       But one can make the test specifically test for the detection. All predef definitions
       are defined as a zero (0) expression when not detected. Hence one could use
       the detection with a natural single condition. For example:
     </p>
-<p>
-</p>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">predef</span><span class="special">.</span><span class="identifier">h</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">iostream</span><span class="special">&gt;</span>
 
@@ -113,13 +101,9 @@
 <span class="special">}</span>
 </pre>
 <p>
- </p>
-<p>
       And since the predef's are preprocessor definitions the same is possible from
       the preprocessor:
     </p>
-<p>
-</p>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">predef</span><span class="special">.</span><span class="identifier">h</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">iostream</span><span class="special">&gt;</span>
 
@@ -139,8 +123,6 @@
   <span class="keyword">return</span> <span class="number">0</span><span class="special">;</span>
 <span class="special">}</span>
 </pre>
-<p>
- </p>
 <h4>
 <a name="predef.using_the_predefs.h0"></a>
       <span><a name="predef.using_the_predefs.using_the_boost_version_number_m"></a></span><a class="link" href="using_the_predefs.html#predef.using_the_predefs.using_the_boost_version_number_m">Using the
@@ -150,13 +132,9 @@
       All the predefs are defined to be a use of the <code class="computeroutput"><span class="identifier">BOOST_VERSION_NUMBER</span></code>
       macro. The macro takes individual major, minor, and patch value expressions:
     </p>
-<p>
-</p>
 <pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">BOOST_VERSION_NUMBER</span><span class="special">(</span> <span class="identifier">major</span><span class="special">,</span> <span class="identifier">minor</span><span class="special">,</span> <span class="identifier">patch</span> <span class="special">)</span> <span class="special">...</span>
 </pre>
 <p>
- </p>
-<p>
       The arguments are:
     </p>
 <div class="orderedlist"><ol class="orderedlist" type="1">
@@ -185,21 +163,13 @@
       the other predef macros. This means that any allowed base is possible, i.e.
       binary, octal, decimal, and hexadecimal. For example:
     </p>
-<p>
-</p>
 <pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">MY_APPLICATION_VERSION_NUMBER</span> <span class="identifier">BOOST_VERSION_NUMBER</span><span class="special">(</span><span class="number">2</span><span class="special">,</span><span class="number">0xA</span><span class="special">,</span><span class="number">015</span><span class="special">)</span>
 </pre>
 <p>
- </p>
-<p>
       Is equivalent to:
     </p>
-<p>
-</p>
 <pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">MY_APPLICATION_VERSION_NUMBER</span> <span class="identifier">BOOST_VERSION_NUMBER</span><span class="special">(</span><span class="number">2</span><span class="special">,</span><span class="number">10</span><span class="special">,</span><span class="number">13</span><span class="special">)</span>
 </pre>
-<p>
- </p>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>

Modified: sandbox/predef/libs/predef/doc/predef.qbk
==============================================================================
--- sandbox/predef/libs/predef/doc/predef.qbk (original)
+++ sandbox/predef/libs/predef/doc/predef.qbk 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -1,5 +1,5 @@
 [article Predef
- [quickbook 1.6]
+ [quickbook 1.7]
     [version 1.0]
     [authors [Rivera, Rene]]
     [copyright 2005 Rene Rivera, 2008-2011 Redshift Software Inc]

Modified: sandbox/predef/libs/predef/test/make.cpp
==============================================================================
--- sandbox/predef/libs/predef/test/make.cpp (original)
+++ sandbox/predef/libs/predef/test/make.cpp 2011-12-14 22:48:37 EST (Wed, 14 Dec 2011)
@@ -38,6 +38,7 @@
         PREDEF_CHECK(BOOST_PREDEF_MAKE_F_FF_FF_000(0xFFFFF000) == BOOST_VERSION_NUMBER(0xF,0xFF,0xFF));
 
         PREDEF_CHECK(BOOST_PREDEF_MAKE_N_N_N(999) == BOOST_VERSION_NUMBER(9,9,9));
+ PREDEF_CHECK(BOOST_PREDEF_MAKE_N__NNN(9999) == BOOST_VERSION_NUMBER(9,0,999));
         PREDEF_CHECK(BOOST_PREDEF_MAKE_NN_NN_NN(999999) == BOOST_VERSION_NUMBER(99,99,99));
         PREDEF_CHECK(BOOST_PREDEF_MAKE_NN_NN(9999) == BOOST_VERSION_NUMBER(99,99,0));
         PREDEF_CHECK(BOOST_PREDEF_MAKE_N_N_NN(9999) == BOOST_VERSION_NUMBER(9,9,99));
@@ -45,7 +46,10 @@
         PREDEF_CHECK(BOOST_PREDEF_MAKE_N_N_N_000(999000) == BOOST_VERSION_NUMBER(9,9,9));
         PREDEF_CHECK(BOOST_PREDEF_MAKE_N_NN_000(999000) == BOOST_VERSION_NUMBER(9,99,0));
         PREDEF_CHECK(BOOST_PREDEF_MAKE_NN_NN_00_NN_00(9999009900) == BOOST_VERSION_NUMBER(99,99,99));
+ PREDEF_CHECK(BOOST_PREDEF_MAKE_NN_NN_0_NN_00(999909900) == BOOST_VERSION_NUMBER(99,99,99));
         PREDEF_CHECK(BOOST_PREDEF_MAKE_NN_00(9900) == BOOST_VERSION_NUMBER(99,00,00));
+ PREDEF_CHECK(BOOST_PREDEF_MAKE_NN_NN_0_NNNN(999909999) == BOOST_VERSION_NUMBER(99,99,9999));
+ PREDEF_CHECK(BOOST_PREDEF_MAKE_N_NN(999) == BOOST_VERSION_NUMBER(9,99,00));
 
         PREDEF_CHECK(BOOST_PREDEF_MAKE_YYYY_MM_DD(19700101) == BOOST_VERSION_NUMBER(0,1,1));
         PREDEF_CHECK(BOOST_PREDEF_MAKE_YYYY_MM_DD(19710101) == BOOST_VERSION_NUMBER(1,1,1));


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk