From 966707dc1fb44c264fce1697e9559454c50d84c6 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 29 Feb 2020 09:34:42 -0600 Subject: [PATCH] Remove deprecated `HASH_PREDEF_OS_ANDROID`. Fixes #101 (merge from hash-predef) --- doc/history.adoc | 1 + doc/index.html | 143 ++++++++++++---------------- doc/predef.adoc | 2 - include/boost/predef/os.h | 2 - include/boost/predef/os/android.h | 49 ---------- include/boost/predef/other/endian.h | 4 +- 6 files changed, 65 insertions(+), 136 deletions(-) delete mode 100644 include/boost/predef/os/android.h diff --git a/doc/history.adoc b/doc/history.adoc index 9acf446..e8d3227 100644 --- a/doc/history.adoc +++ b/doc/history.adoc @@ -14,6 +14,7 @@ http://www.boost.org/LICENSE_1_0.txt) * Convert documentation to AsciiDoctor format. * Document correct versions for C++ standard. * Fix compile error from not available header when building in WinCE. +* Remove deprecated `BOOST_OS_ANDROID`. == 1.10 diff --git a/doc/index.html b/doc/index.html index 9d3276d..6bfc9d6 100644 --- a/doc/index.html +++ b/doc/index.html @@ -563,28 +563,27 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
  • 4.6. BOOST_PLAT platform macros @@ -3630,10 +3629,20 @@ Specifically the defined versions are:

    ISO/IEC 14882:1998

    -

    41.12.1

    +

    41.3.1

    2011

    ISO/IEC 14882:2011

    + +

    44.2.1

    +

    2014

    +

    ISO/IEC 14882:2014

    + + +

    47.3.1

    +

    2017

    +

    ISO/IEC 14882:2017

    + @@ -4267,44 +4276,7 @@ Version number available as major, minor, and patch.

    -

    4.5.3. BOOST_OS_ANDROID

    -
    - - - - - -
    -
    ℹ
    -    		 -BOOST_OS_ANDROID is deprecated, and will be removed in a following release. -Please use BOOST_PLAT_ANDROID instead. -
    -
    -
    -

    Android operating system.

    -
    - ---- - - - - - - - - - - - - -
    SymbolVersion

    __ANDROID__

    detection

    -
    -
    -

    4.5.4. BOOST_OS_BEOS

    +

    4.5.3. BOOST_OS_BEOS

    BeOS operating system.

    @@ -4328,7 +4300,7 @@ Please use BOOST_PLAT_ANDROID instead.
    -

    4.5.5. BOOST_OS_BSD

    +

    4.5.4. BOOST_OS_BSD

    BSD operating system.

    @@ -4409,7 +4381,7 @@ of BSD. If the above variants is detected the corresponding macro is also set.
    -

    4.5.6. BOOST_OS_CYGWIN

    +

    4.5.5. BOOST_OS_CYGWIN

    Cygwin evironment.

    @@ -4437,7 +4409,7 @@ of BSD. If the above variants is detected the corresponding macro is also set.
    -

    4.5.7. BOOST_OS_HAIKU

    +

    4.5.6. BOOST_OS_HAIKU

    Haiku operating system.

    @@ -4461,7 +4433,7 @@ of BSD. If the above variants is detected the corresponding macro is also set.
    -

    4.5.8. BOOST_OS_HPUX

    +

    4.5.7. BOOST_OS_HPUX

    HP-UX operating system.

    @@ -4493,7 +4465,7 @@ of BSD. If the above variants is detected the corresponding macro is also set.
    -

    4.5.9. BOOST_OS_IOS

    +

    4.5.8. BOOST_OS_IOS

    iOS operating system.

    @@ -4529,7 +4501,7 @@ of BSD. If the above variants is detected the corresponding macro is also set.
    -

    4.5.10. BOOST_OS_IRIX

    +

    4.5.9. BOOST_OS_IRIX

    IRIX operating system.

    @@ -4557,7 +4529,7 @@ of BSD. If the above variants is detected the corresponding macro is also set.
    -

    4.5.11. BOOST_OS_LINUX

    +

    4.5.10. BOOST_OS_LINUX

    Linux operating system.

    @@ -4593,7 +4565,7 @@ of BSD. If the above variants is detected the corresponding macro is also set.
    -

    4.5.12. BOOST_OS_MACOS

    +

    4.5.11. BOOST_OS_MACOS

    Mac OS operating system.

    @@ -4637,7 +4609,7 @@ of BSD. If the above variants is detected the corresponding macro is also set.
    -

    4.5.13. BOOST_OS_OS400

    +

    4.5.12. BOOST_OS_OS400

    IBM OS/400 operating system.

    @@ -4661,7 +4633,7 @@ of BSD. If the above variants is detected the corresponding macro is also set.
    -

    4.5.14. BOOST_OS_QNX

    +

    4.5.13. BOOST_OS_QNX

    QNX operating system. Version number available as major, and minor if possible. And @@ -4699,7 +4671,7 @@ version 4 is specifically detected.

    -

    4.5.15. BOOST_OS_SOLARIS

    +

    4.5.14. BOOST_OS_SOLARIS

    Solaris operating system.

    @@ -4727,7 +4699,7 @@ version 4 is specifically detected.

    -

    4.5.16. BOOST_OS_UNIX

    +

    4.5.15. BOOST_OS_UNIX

    Unix Environment operating system.

    @@ -4763,7 +4735,7 @@ version 4 is specifically detected.

    -

    4.5.17. BOOST_OS_SVR4

    +

    4.5.16. BOOST_OS_SVR4

    SVR4 Environment operating system.

    @@ -4799,7 +4771,7 @@ version 4 is specifically detected.

    -

    4.5.18. BOOST_OS_VMS

    +

    4.5.17. BOOST_OS_VMS

    VMS operating system.

    @@ -4831,7 +4803,7 @@ version 4 is specifically detected.

    -

    4.5.19. BOOST_OS_WINDOWS

    +

    4.5.18. BOOST_OS_WINDOWS

    Microsoft Windows operating system.

    @@ -4871,7 +4843,7 @@ version 4 is specifically detected.

    -

    4.5.20. BOOST_OS_BSD_BSDI

    +

    4.5.19. BOOST_OS_BSD_BSDI

    BSDi BSD/OS operating system.

    @@ -4895,7 +4867,7 @@ version 4 is specifically detected.

    -

    4.5.21. BOOST_OS_BSD_DRAGONFLY

    +

    4.5.20. BOOST_OS_BSD_DRAGONFLY

    DragonFly BSD operating system.

    @@ -4919,7 +4891,7 @@ version 4 is specifically detected.

    -

    4.5.22. BOOST_OS_BSD_FREE

    +

    4.5.21. BOOST_OS_BSD_FREE

    FreeBSD operating system.

    @@ -4947,7 +4919,7 @@ version 4 is specifically detected.

    -

    4.5.23. BOOST_OS_BSD_NET

    +

    4.5.22. BOOST_OS_BSD_NET

    NetBSD operating system.

    @@ -4995,7 +4967,7 @@ version 4 is specifically detected.

    -

    4.5.24. BOOST_OS_BSD_OPEN

    +

    4.5.23. BOOST_OS_BSD_OPEN

    OpenBSD operating system.

    @@ -6765,6 +6737,15 @@ expressions. It defaults to "c++", but can be any of: "c", "cpp",

  • Convert documentation to AsciiDoctor format.

    • +
  • +

    Document correct versions for C++ standard.

    +
    • +
  • +

    Fix compile error from not available header when building in WinCE.

    +
    • +
  • +

    Remove deprecated BOOST_OS_ANDROID.

    +
    • diff --git a/doc/predef.adoc b/doc/predef.adoc index a04c2bd..7249f5f 100644 --- a/doc/predef.adoc +++ b/doc/predef.adoc @@ -724,8 +724,6 @@ include::../include/boost/predef/os/aix.h[tag=reference] include::../include/boost/predef/os/amigaos.h[tag=reference] -include::../include/boost/predef/os/android.h[tag=reference] - include::../include/boost/predef/os/beos.h[tag=reference] include::../include/boost/predef/os/bsd.h[tag=reference] diff --git a/include/boost/predef/os.h b/include/boost/predef/os.h index 9a9f9c6..da28e1c 100644 --- a/include/boost/predef/os.h +++ b/include/boost/predef/os.h @@ -29,6 +29,4 @@ http://www.boost.org/LICENSE_1_0.txt) #include #include -#include - #endif diff --git a/include/boost/predef/os/android.h b/include/boost/predef/os/android.h deleted file mode 100644 index 99a1cd0..0000000 --- a/include/boost/predef/os/android.h +++ /dev/null @@ -1,49 +0,0 @@ -/* -Copyright Rene Rivera 2015 -Distributed under the 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_ANDROID_H -#define BOOST_PREDEF_OS_ANDROID_H - -#include -#include - -/* tag::reference[] -= `BOOST_OS_ANDROID` - -NOTE: `BOOST_OS_ANDROID` is deprecated, and will be removed in a following release. -Please use `BOOST_PLAT_ANDROID` instead. - -http://en.wikipedia.org/wiki/Android_%28operating_system%29[Android] operating system. - -[options="header"] -|=== -| {predef_symbol} | {predef_version} - -| `+__ANDROID__+` | {predef_detection} -|=== -*/ // end::reference[] - -#define BOOST_OS_ANDROID BOOST_VERSION_NUMBER_NOT_AVAILABLE - -#if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \ - defined(__ANDROID__) \ - ) -# undef BOOST_OS_ANDROID -# define BOOST_OS_ANDROID BOOST_VERSION_NUMBER_AVAILABLE -#endif - -#if BOOST_OS_ANDROID -# define BOOST_OS_ANDROID_AVAILABLE -# include -#endif - -#define BOOST_OS_ANDROID_NAME "Android" - -#endif - -#include -BOOST_PREDEF_DECLARE_TEST(BOOST_OS_ANDROID,BOOST_OS_ANDROID_NAME) diff --git a/include/boost/predef/other/endian.h b/include/boost/predef/other/endian.h index a8c6abe..0281e4a 100644 --- a/include/boost/predef/other/endian.h +++ b/include/boost/predef/other/endian.h @@ -13,7 +13,7 @@ http://www.boost.org/LICENSE_1_0.txt) #include #include #include -#include +#include /* tag::reference[] = `BOOST_ENDIAN_*` @@ -54,7 +54,7 @@ information and acquired knowledge: */ #if !BOOST_ENDIAN_BIG_BYTE && !BOOST_ENDIAN_BIG_WORD && \ !BOOST_ENDIAN_LITTLE_BYTE && !BOOST_ENDIAN_LITTLE_WORD -# if BOOST_LIB_C_GNU || BOOST_OS_ANDROID +# if BOOST_LIB_C_GNU || BOOST_PLAT_ANDROID # include # else # if BOOST_OS_MACOS