diff --git a/doc/history.qbk b/doc/history.qbk index 3441fbd..f8c0b47 100644 --- a/doc/history.qbk +++ b/doc/history.qbk @@ -13,6 +13,7 @@ http://www.boost.org/LICENSE_1_0.txt) This supports version of VS 2015 an onward. * Add detection of Haiku OS (from Jessica Hamilton). * Some fixes to endian detection for Android (from mstahl-at-redhat.com). +* Add missing `BOOST_PREDEF_MAKE_0X_VVRRPP` macro (from Erik Lindahl). [heading 1.1] diff --git a/doc/html/index.html b/doc/html/index.html index 6e585eb..603afa7 100644 --- a/doc/html/index.html +++ b/doc/html/index.html @@ -52,7 +52,7 @@ - +

Last revised: December 30, 2014 at 05:22:51 GMT

Last revised: December 30, 2014 at 14:12:07 GMT


diff --git a/doc/html/predef/history.html b/doc/html/predef/history.html index b65b9c2..d7dc619 100644 --- a/doc/html/predef/history.html +++ b/doc/html/predef/history.html @@ -32,6 +32,10 @@
  • Some fixes to endian detection for Android (from mstahl-at-redhat.com).
  • +
  • + Add missing BOOST_PREDEF_MAKE_0X_VVRRPP + macro (from Erik Lindahl). +
  • diff --git a/doc/html/predef/reference/version_definition_macros.html b/doc/html/predef/reference/version_definition_macros.html index 8e70c48..84fed35 100644 --- a/doc/html/predef/reference/version_definition_macros.html +++ b/doc/html/predef/reference/version_definition_macros.html @@ -105,6 +105,9 @@

    BOOST_PREDEF_MAKE_0X_VRRPP000(V)

    +

    + BOOST_PREDEF_MAKE_0X_VVRRPP(V) +

    BOOST_PREDEF_MAKE_10_VPPP(V)

    diff --git a/include/boost/predef/make.h b/include/boost/predef/make.h index d327906..f8c28d1 100644 --- a/include/boost/predef/make.h +++ b/include/boost/predef/make.h @@ -42,6 +42,8 @@ Macros are: #define BOOST_PREDEF_MAKE_0X_VVRRP(V) BOOST_VERSION_NUMBER((V&0xFF000)>>12,(V&0xFF0)>>4,(V&0xF)) /*` `BOOST_PREDEF_MAKE_0X_VRRPP000(V)` */ #define BOOST_PREDEF_MAKE_0X_VRRPP000(V) BOOST_VERSION_NUMBER((V&0xF0000000)>>28,(V&0xFF00000)>>20,(V&0xFF000)>>12) +/*` `BOOST_PREDEF_MAKE_0X_VVRRPP(V)` */ +#define BOOST_PREDEF_MAKE_0X_VVRRPP(V) BOOST_VERSION_NUMBER((V&0xFF0000)>>16,(V&0xFF00)>>8,(V&0xFF)) /*` `BOOST_PREDEF_MAKE_10_VPPP(V)` */ #define BOOST_PREDEF_MAKE_10_VPPP(V) BOOST_VERSION_NUMBER(((V)/1000)%10,0,(V)%1000) /*` `BOOST_PREDEF_MAKE_10_VRP(V)` */ diff --git a/test/make.cpp b/test/make.cpp index 9dbd4a8..3ae8192 100644 --- a/test/make.cpp +++ b/test/make.cpp @@ -36,6 +36,7 @@ void test_BOOST_VERSION_NUMBER() PREDEF_CHECK(BOOST_PREDEF_MAKE_0X_VRRPPPP(0xFFFFFFF) == BOOST_VERSION_NUMBER(0xF,0xFF,0xFFFF)); PREDEF_CHECK(BOOST_PREDEF_MAKE_0X_VVRRP(0xFFFFF) == BOOST_VERSION_NUMBER(0xFF,0xFF,0xF)); PREDEF_CHECK(BOOST_PREDEF_MAKE_0X_VRRPP000(0xFFFFF000) == BOOST_VERSION_NUMBER(0xF,0xFF,0xFF)); + PREDEF_CHECK(BOOST_PREDEF_MAKE_0X_VVRRPP(0xFFFFFF) == BOOST_VERSION_NUMBER(0xFF,0xFF,0xFF)); PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VRP(999) == BOOST_VERSION_NUMBER(9,9,9)); PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VPPP(9999) == BOOST_VERSION_NUMBER(9,0,999));