boostorg/predef
1
0
Fork 1
mirror of https://github.com/boostorg/predef.git synced 2025-07-29 11:37:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse Source
This commit is contained in:
Rene Rivera
2017-11-10 09:01:39 -06:00
parent e62a9c68b1 5e8f5d5a4b
commit c8c26821b9
6 changed files with 103 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/boost/predef/library/c.h
View File

@ -12,7 +12,7 @@ http://www.boost.org/LICENSE_1_0.txt)
#include <boost/predef/library/c/_prefix.h>
#include <boost/predef/library/c/cloudlibc.h>
#include <boost/predef/library/c/cloudabi.h>
#include <boost/predef/library/c/gnu.h>
#include <boost/predef/library/c/uc.h>
#include <boost/predef/library/c/vms.h>

8
include/boost/predef/library/c/cloudlibc.h → include/boost/predef/library/c/cloudabi.h
View File

@ -1,13 +1,13 @@
/*
* Copyright (C) 2017 James E. King, III
* Copyright (C) 2017 James E. King III
*
* Distributed under the 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_LIBRARY_C_CLOUDLIBC_H
#define BOOST_PREDEF_LIBRARY_C_CLOUDLIBC_H
#ifndef BOOST_PREDEF_LIBRARY_C_CLOUDABI_H
#define BOOST_PREDEF_LIBRARY_C_CLOUDABI_H
#include <boost/predef/version_number.h>
#include <boost/predef/make.h>
@ -37,7 +37,7 @@ Version number available as major, and minor.
#if defined(__cloudlibc__)
# undef BOOST_LIB_C_CLOUDABI
# define BOOST_LIB_C_CLOUBABI \
# define BOOST_LIB_C_CLOUDABI \
BOOST_VERSION_NUMBER(__cloudlibc_major__,__cloudlibc_minor__,0)
#endif

4
include/boost/predef/make.h
View File

@ -50,6 +50,8 @@ Macros are:
#define BOOST_PREDEF_MAKE_10_VRP(V) BOOST_VERSION_NUMBER(((V)/100)%10,((V)/10)%10,(V)%10)
/*` `BOOST_PREDEF_MAKE_10_VRP000(V)` */
#define BOOST_PREDEF_MAKE_10_VRP000(V) BOOST_VERSION_NUMBER(((V)/100000)%10,((V)/10000)%10,((V)/1000)%10)
/*` `BOOST_PREDEF_MAKE_10_VRPPPP(V)` */
#define BOOST_PREDEF_MAKE_10_VRPPPP(V) BOOST_VERSION_NUMBER(((V)/100000)%10,((V)/10000)%10,(V)%10000)
/*` `BOOST_PREDEF_MAKE_10_VRPP(V)` */
#define BOOST_PREDEF_MAKE_10_VRPP(V) BOOST_VERSION_NUMBER(((V)/1000)%10,((V)/100)%10,(V)%100)
/*` `BOOST_PREDEF_MAKE_10_VRR(V)` */
@ -64,6 +66,8 @@ Macros are:
#define BOOST_PREDEF_MAKE_10_VVRR(V) BOOST_VERSION_NUMBER(((V)/100)%100,(V)%100,0)
/*` `BOOST_PREDEF_MAKE_10_VVRRPP(V)` */
#define BOOST_PREDEF_MAKE_10_VVRRPP(V) BOOST_VERSION_NUMBER(((V)/10000)%100,((V)/100)%100,(V)%100)
/*` `BOOST_PREDEF_MAKE_10_VVRRPPP(V)` */
#define BOOST_PREDEF_MAKE_10_VVRRPPP(V) BOOST_VERSION_NUMBER(((V)/100000)%100,((V)/1000)%100,(V)%1000)
/*` `BOOST_PREDEF_MAKE_10_VVRR0PP00(V)` */
#define BOOST_PREDEF_MAKE_10_VVRR0PP00(V) BOOST_VERSION_NUMBER(((V)/10000000)%100,((V)/100000)%100,((V)/100)%100)
/*` `BOOST_PREDEF_MAKE_10_VVRR0PPPP(V)` */

13
include/boost/predef/os/bsd/free.h
View File

@ -34,13 +34,20 @@ http://www.boost.org/LICENSE_1_0.txt)
# define BOOST_OS_BSD_AVAILABLE
# endif
# undef BOOST_OS_BSD_FREE
# include <sys/param.h>
# if defined(__FreeBSD_version)
# if __FreeBSD_version < 500000
# if __FreeBSD_version == 491000
# define BOOST_OS_BSD_FREE \
BOOST_PREDEF_MAKE_10_VRP000(__FreeBSD_version)
BOOST_VERSION_NUMBER(4, 10, 0)
# elif __FreeBSD_version == 492000
# define BOOST_OS_BSD_FREE \
BOOST_VERSION_NUMBER(4, 11, 0)
# elif __FreeBSD_version < 500000
# define BOOST_OS_BSD_FREE \
BOOST_PREDEF_MAKE_10_VRPPPP(__FreeBSD_version)
# else
# define BOOST_OS_BSD_FREE \
BOOST_PREDEF_MAKE_10_VRR000(__FreeBSD_version)
BOOST_PREDEF_MAKE_10_VVRRPPP(__FreeBSD_version)
# endif
# else
# define BOOST_OS_BSD_FREE BOOST_VERSION_NUMBER_AVAILABLE

80
include/boost/predef/os/bsd/open.h
View File

@ -50,6 +50,26 @@ http://www.boost.org/LICENSE_1_0.txt)
[[`OpenBSD4_7`] [4.7.0]]
[[`OpenBSD4_8`] [4.8.0]]
[[`OpenBSD4_9`] [4.9.0]]
[[`OpenBSD5_0`] [5.0.0]]
[[`OpenBSD5_1`] [5.1.0]]
[[`OpenBSD5_2`] [5.2.0]]
[[`OpenBSD5_3`] [5.3.0]]
[[`OpenBSD5_4`] [5.4.0]]
[[`OpenBSD5_5`] [5.5.0]]
[[`OpenBSD5_6`] [5.6.0]]
[[`OpenBSD5_7`] [5.7.0]]
[[`OpenBSD5_8`] [5.8.0]]
[[`OpenBSD5_9`] [5.9.0]]
[[`OpenBSD6_0`] [6.0.0]]
[[`OpenBSD6_1`] [6.1.0]]
[[`OpenBSD6_2`] [6.2.0]]
[[`OpenBSD6_3`] [6.3.0]]
[[`OpenBSD6_4`] [6.4.0]]
[[`OpenBSD6_5`] [6.5.0]]
[[`OpenBSD6_6`] [6.6.0]]
[[`OpenBSD6_7`] [6.7.0]]
[[`OpenBSD6_8`] [6.8.0]]
[[`OpenBSD6_9`] [6.9.0]]
]
*/
@ -153,6 +173,66 @@ http://www.boost.org/LICENSE_1_0.txt)
# if !defined(BOOST_OS_BSD_OPEN) && defined(OpenBSD4_9)
# define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(4,9,0)
# endif
# if !defined(BOOST_OS_BSD_OPEN) && defined(OpenBSD5_0)
# define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(5,0,0)
# endif
# if !defined(BOOST_OS_BSD_OPEN) && defined(OpenBSD5_1)
# define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(5,1,0)
# endif
# if !defined(BOOST_OS_BSD_OPEN) && defined(OpenBSD5_2)
# define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(5,2,0)
# endif
# if !defined(BOOST_OS_BSD_OPEN) && defined(OpenBSD5_3)
# define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(5,3,0)
# endif
# if !defined(BOOST_OS_BSD_OPEN) && defined(OpenBSD5_4)
# define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(5,4,0)
# endif
# if !defined(BOOST_OS_BSD_OPEN) && defined(OpenBSD5_5)
# define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(5,5,0)
# endif
# if !defined(BOOST_OS_BSD_OPEN) && defined(OpenBSD5_6)
# define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(5,6,0)
# endif
# if !defined(BOOST_OS_BSD_OPEN) && defined(OpenBSD5_7)
# define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(5,7,0)
# endif
# if !defined(BOOST_OS_BSD_OPEN) && defined(OpenBSD5_8)
# define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(5,8,0)
# endif
# if !defined(BOOST_OS_BSD_OPEN) && defined(OpenBSD5_9)
# define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(5,9,0)
# endif
# if !defined(BOOST_OS_BSD_OPEN) && defined(OpenBSD6_0)
# define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(6,0,0)
# endif
# if !defined(BOOST_OS_BSD_OPEN) && defined(OpenBSD6_1)
# define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(6,1,0)
# endif
# if !defined(BOOST_OS_BSD_OPEN) && defined(OpenBSD6_2)
# define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(6,2,0)
# endif
# if !defined(BOOST_OS_BSD_OPEN) && defined(OpenBSD6_3)
# define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(6,3,0)
# endif
# if !defined(BOOST_OS_BSD_OPEN) && defined(OpenBSD6_4)
# define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(6,4,0)
# endif
# if !defined(BOOST_OS_BSD_OPEN) && defined(OpenBSD6_5)
# define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(6,5,0)
# endif
# if !defined(BOOST_OS_BSD_OPEN) && defined(OpenBSD6_6)
# define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(6,6,0)
# endif
# if !defined(BOOST_OS_BSD_OPEN) && defined(OpenBSD6_7)
# define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(6,7,0)
# endif
# if !defined(BOOST_OS_BSD_OPEN) && defined(OpenBSD6_8)
# define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(6,8,0)
# endif
# if !defined(BOOST_OS_BSD_OPEN) && defined(OpenBSD6_9)
# define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER(6,9,0)
# endif
# if !defined(BOOST_OS_BSD_OPEN)
# define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER_AVAILABLE
# endif

4
test/make.cpp
View File

@ -44,6 +44,8 @@ void test_BOOST_VERSION_NUMBER()
PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VVRR(9999) == BOOST_VERSION_NUMBER(99,99,0));
PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VRPP(9999) == BOOST_VERSION_NUMBER(9,9,99));
PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VRRPP(99999) == BOOST_VERSION_NUMBER(9,99,99));
PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VRPPPP(460002) == BOOST_VERSION_NUMBER(4,6,2));
PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VRPPPP(491000) == BOOST_VERSION_NUMBER(4,9,1000));
PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VRP000(999000) == BOOST_VERSION_NUMBER(9,9,9));
PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VRR000(999000) == BOOST_VERSION_NUMBER(9,99,0));
PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VVRR00PP00(2199009900u) == BOOST_VERSION_NUMBER(21,99,99));
@ -52,6 +54,8 @@ void test_BOOST_VERSION_NUMBER()
PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VV00(9900) == BOOST_VERSION_NUMBER(99,00,00));
PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VVRR0PPPP(999909999) == BOOST_VERSION_NUMBER(99,99,9999));
PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VRR(999) == BOOST_VERSION_NUMBER(9,99,00));
PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VVRRPPP(903122) == BOOST_VERSION_NUMBER(9,3,122));
PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VVRRPPP(1101002) == BOOST_VERSION_NUMBER(11,1,2));
PREDEF_CHECK(BOOST_PREDEF_MAKE_DATE(1971,1,1) == BOOST_VERSION_NUMBER(1,1,1));
PREDEF_CHECK(BOOST_PREDEF_MAKE_YYYYMMDD(19700101) == BOOST_VERSION_NUMBER(0,1,1));