Skip to content

Commit a3986b3

Browse files
redboltzredboltz
authored
Merge pull request #730 from froydnj/update-predef-and-preprocessor
update boost predef and preprocessor from 1.61.0 to 1.68.0
2 parents 7fed49e + b6d4bb5 commit a3986b3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1007
-59
lines changed

‎Files.cmake‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ LIST (APPEND msgpackc_HEADERS
2424
include/msgpack/predef/architecture/mips.h
2525
include/msgpack/predef/architecture/parisc.h
2626
include/msgpack/predef/architecture/ppc.h
27+
include/msgpack/predef/architecture/ptx.h
2728
include/msgpack/predef/architecture/pyramid.h
2829
include/msgpack/predef/architecture/rs6k.h
2930
include/msgpack/predef/architecture/sparc.h
@@ -57,6 +58,7 @@ LIST (APPEND msgpackc_HEADERS
5758
include/msgpack/predef/compiler/metrowerks.h
5859
include/msgpack/predef/compiler/microtec.h
5960
include/msgpack/predef/compiler/mpw.h
61+
include/msgpack/predef/compiler/nvcc.h
6062
include/msgpack/predef/compiler/palm.h
6163
include/msgpack/predef/compiler/pgi.h
6264
include/msgpack/predef/compiler/sgi_mipspro.h
@@ -83,12 +85,14 @@ LIST (APPEND msgpackc_HEADERS
8385
include/msgpack/predef/hardware/simd/x86_amd.h
8486
include/msgpack/predef/hardware/simd/x86_amd/versions.h
8587
include/msgpack/predef/language.h
88+
include/msgpack/predef/language/cuda.h
8689
include/msgpack/predef/language/objc.h
8790
include/msgpack/predef/language/stdc.h
8891
include/msgpack/predef/language/stdcpp.h
8992
include/msgpack/predef/library.h
9093
include/msgpack/predef/library/c.h
9194
include/msgpack/predef/library/c/_prefix.h
95+
include/msgpack/predef/library/c/cloudabi.h
9296
include/msgpack/predef/library/c/gnu.h
9397
include/msgpack/predef/library/c/uc.h
9498
include/msgpack/predef/library/c/vms.h
@@ -132,12 +136,20 @@ LIST (APPEND msgpackc_HEADERS
132136
include/msgpack/predef/os/windows.h
133137
include/msgpack/predef/other.h
134138
include/msgpack/predef/other/endian.h
139+
include/msgpack/predef/other/workaround.h
135140
include/msgpack/predef/platform.h
141+
include/msgpack/predef/platform/cloudabi.h
142+
include/msgpack/predef/platform/ios.h
136143
include/msgpack/predef/platform/mingw.h
144+
include/msgpack/predef/platform/mingw32.h
145+
include/msgpack/predef/platform/mingw64.h
137146
include/msgpack/predef/platform/windows_desktop.h
138147
include/msgpack/predef/platform/windows_phone.h
139148
include/msgpack/predef/platform/windows_runtime.h
149+
include/msgpack/predef/platform/windows_server.h
140150
include/msgpack/predef/platform/windows_store.h
151+
include/msgpack/predef/platform/windows_system.h
152+
include/msgpack/predef/platform/windows_uwp.h
141153
include/msgpack/predef/version.h
142154
include/msgpack/predef/version_number.h
143155
include/msgpack/sbuffer.h
@@ -444,6 +456,7 @@ IF (MSGPACK_ENABLE_CXX)
444456
include/msgpack/preprocessor/seq/detail/binary_transform.hpp
445457
include/msgpack/preprocessor/seq/detail/is_empty.hpp
446458
include/msgpack/preprocessor/seq/detail/split.hpp
459+
include/msgpack/preprocessor/seq/detail/to_list_msvc.hpp
447460
include/msgpack/preprocessor/seq/elem.hpp
448461
include/msgpack/preprocessor/seq/enum.hpp
449462
include/msgpack/preprocessor/seq/filter.hpp

‎external/boost/predef‎

Submodule predef updated 112 files

‎external/boost/preprocessor‎

‎include/msgpack/predef/architecture.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ Distributed under the Boost Software License, Version 1.0.
1919
#include <msgpack/predef/architecture/mips.h>
2020
#include <msgpack/predef/architecture/parisc.h>
2121
#include <msgpack/predef/architecture/ppc.h>
22+
#include <msgpack/predef/architecture/ptx.h>
2223
#include <msgpack/predef/architecture/pyramid.h>
2324
#include <msgpack/predef/architecture/rs6k.h>
2425
#include <msgpack/predef/architecture/sparc.h>

‎include/msgpack/predef/architecture/arm.h‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,23 @@ Distributed under the Boost Software License, Version 1.0.
2727
[[`__TARGET_ARCH_ARM`] [__predef_detection__]]
2828
[[`__TARGET_ARCH_THUMB`] [__predef_detection__]]
2929
[[`_M_ARM`] [__predef_detection__]]
30+
[[`_M_ARM64`] [__predef_detection__]]
3031
3132
[[`__arm64`] [8.0.0]]
3233
[[`__TARGET_ARCH_ARM`] [V.0.0]]
3334
[[`__TARGET_ARCH_THUMB`] [V.0.0]]
35+
[[`__ARM_ARCH`] [V.0.0]]
3436
[[`_M_ARM`] [V.0.0]]
37+
[[`_M_ARM64`] [8.0.0]]
3538
]
3639
*/
3740

3841
#define MSGPACK_ARCH_ARM MSGPACK_VERSION_NUMBER_NOT_AVAILABLE
3942

4043
#if defined(__arm__) || defined(__arm64) || defined(__thumb__) || \
4144
defined(__TARGET_ARCH_ARM) || defined(__TARGET_ARCH_THUMB) || \
42-
defined(_M_ARM)
45+
defined(__ARM_ARCH) || \
46+
defined(_M_ARM) || defined(_M_ARM64)
4347
# undef MSGPACK_ARCH_ARM
4448
# if !defined(MSGPACK_ARCH_ARM) && defined(__arm64)
4549
# define MSGPACK_ARCH_ARM MSGPACK_VERSION_NUMBER(8,0,0)
@@ -50,6 +54,12 @@ Distributed under the Boost Software License, Version 1.0.
5054
# if !defined(MSGPACK_ARCH_ARM) && defined(__TARGET_ARCH_THUMB)
5155
# define MSGPACK_ARCH_ARM MSGPACK_VERSION_NUMBER(__TARGET_ARCH_THUMB,0,0)
5256
# endif
57+
# if !defined(MSGPACK_ARCH_ARM) && defined(__ARM_ARCH)
58+
# define MSGPACK_ARCH_ARM MSGPACK_VERSION_NUMBER(__ARM_ARCH,0,0)
59+
# endif
60+
# if !defined(MSGPACK_ARCH_ARM) && defined(_M_ARM64)
61+
# define MSGPACK_ARCH_ARM MSGPACK_VERSION_NUMBER(8,0,0)
62+
# endif
5363
# if !defined(MSGPACK_ARCH_ARM) && defined(_M_ARM)
5464
# define MSGPACK_ARCH_ARM MSGPACK_VERSION_NUMBER(_M_ARM,0,0)
5565
# endif

‎include/msgpack/predef/architecture/parisc.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Distributed under the Boost Software License, Version 1.0.
1212
#include <msgpack/predef/make.h>
1313

1414
/*`
15-
[heading `MSGPACK_ARCH_PARISK`]
15+
[heading `MSGPACK_ARCH_PARISC`]
1616
1717
[@http://en.wikipedia.org/wiki/PA-RISC_family HP/PA RISC] architecture.
1818

‎include/msgpack/predef/architecture/ptx.h‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
/*
2+
Copyright Benjamin Worpitz 2018
3+
Distributed under the Boost Software License, Version 1.0.
4+
(See accompanying file LICENSE_1_0.txt or copy at
5+
http://www.boost.org/LICENSE_1_0.txt)
6+
*/
7+
8+
#ifndef MSGPACK_PREDEF_ARCHITECTURE_PTX_H
9+
#define MSGPACK_PREDEF_ARCHITECTURE_PTX_H
10+
11+
#include <msgpack/predef/version_number.h>
12+
#include <msgpack/predef/make.h>
13+
14+
/*`
15+
[heading `MSGPACK_ARCH_PTX`]
16+
17+
[@https://en.wikipedia.org/wiki/Parallel_Thread_Execution PTX] architecture.
18+
19+
[table
20+
[[__predef_symbol__] [__predef_version__]]
21+
22+
[[`__CUDA_ARCH__`] [__predef_detection__]]
23+
24+
[[`__CUDA_ARCH__`] [V.R.0]]
25+
]
26+
*/
27+
28+
#define MSGPACK_ARCH_PTX MSGPACK_VERSION_NUMBER_NOT_AVAILABLE
29+
30+
#if defined(__CUDA_ARCH__)
31+
# undef MSGPACK_ARCH_PTX
32+
# define MSGPACK_ARCH_PTX MSGPACK_PREDEF_MAKE_10_VR0(__CUDA_ARCH__)
33+
#endif
34+
35+
#if MSGPACK_ARCH_PTX
36+
# define MSGPACK_ARCH_PTX_AVAILABLE
37+
#endif
38+
39+
#define MSGPACK_ARCH_PTX_NAME "PTX"
40+
41+
#endif
42+
43+
#include <msgpack/predef/detail/test.h>
44+
MSGPACK_PREDEF_DECLARE_TEST(MSGPACK_ARCH_PTX,MSGPACK_ARCH_PTX_NAME)

‎include/msgpack/predef/compiler.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ Distributed under the Boost Software License, Version 1.0.
3232
#include <msgpack/predef/compiler/metrowerks.h>
3333
#include <msgpack/predef/compiler/microtec.h>
3434
#include <msgpack/predef/compiler/mpw.h>
35+
#include <msgpack/predef/compiler/nvcc.h>
3536
#include <msgpack/predef/compiler/palm.h>
3637
#include <msgpack/predef/compiler/pgi.h>
3738
#include <msgpack/predef/compiler/sgi_mipspro.h>

‎include/msgpack/predef/compiler/intel.h‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright Rene Rivera 2008-2015
2+
Copyright Rene Rivera 2008-2017
33
Distributed under the Boost Software License, Version 1.0.
44
(See accompanying file LICENSE_1_0.txt or copy at
55
http://www.boost.org/LICENSE_1_0.txt)
@@ -25,16 +25,30 @@ Version number available as major, minor, and patch.
2525
[[`__ICC`] [__predef_detection__]]
2626
[[`__ECC`] [__predef_detection__]]
2727
28-
[[`__INTEL_COMPILER`] [V.R.P]]
28+
[[`__INTEL_COMPILER`] [V.R]]
29+
[[`__INTEL_COMPILER` and `__INTEL_COMPILER_UPDATE`] [V.R.P]]
2930
]
3031
*/
3132

3233
#define MSGPACK_COMP_INTEL MSGPACK_VERSION_NUMBER_NOT_AVAILABLE
3334

3435
#if defined(__INTEL_COMPILER) || defined(__ICL) || defined(__ICC) || \
3536
defined(__ECC)
37+
/*`
38+
[note Because of an Intel mistake in the release version numbering when
39+
`__INTEL_COMPILER` is `9999` it is detected as version 12.1.0.]
40+
*/
41+
# if !defined(MSGPACK_COMP_INTEL_DETECTION) && defined(__INTEL_COMPILER) && (__INTEL_COMPILER == 9999)
42+
# define MSGPACK_COMP_INTEL_DETECTION MSGPACK_VERSION_NUMBER(12,1,0)
43+
# endif
44+
# if !defined(MSGPACK_COMP_INTEL_DETECTION) && defined(__INTEL_COMPILER) && defined(__INTEL_COMPILER_UPDATE)
45+
# define MSGPACK_COMP_INTEL_DETECTION MSGPACK_VERSION_NUMBER( \
46+
MSGPACK_VERSION_NUMBER_MAJOR(MSGPACK_PREDEF_MAKE_10_VVRR(__INTEL_COMPILER)), \
47+
MSGPACK_VERSION_NUMBER_MINOR(MSGPACK_PREDEF_MAKE_10_VVRR(__INTEL_COMPILER)), \
48+
__INTEL_COMPILER_UPDATE)
49+
# endif
3650
# if !defined(MSGPACK_COMP_INTEL_DETECTION) && defined(__INTEL_COMPILER)
37-
# define MSGPACK_COMP_INTEL_DETECTION MSGPACK_PREDEF_MAKE_10_VRP(__INTEL_COMPILER)
51+
# define MSGPACK_COMP_INTEL_DETECTION MSGPACK_PREDEF_MAKE_10_VVRR(__INTEL_COMPILER)
3852
# endif
3953
# if !defined(MSGPACK_COMP_INTEL_DETECTION)
4054
# define MSGPACK_COMP_INTEL_DETECTION MSGPACK_VERSION_NUMBER_AVAILABLE

‎include/msgpack/predef/compiler/nvcc.h‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
/*
2+
Copyright Benjamin Worpitz 2018
3+
Distributed under the Boost Software License, Version 1.0.
4+
(See accompanying file LICENSE_1_0.txt or copy at
5+
http://www.boost.org/LICENSE_1_0.txt)
6+
*/
7+
8+
#ifndef MSGPACK_PREDEF_COMPILER_NVCC_H
9+
#define MSGPACK_PREDEF_COMPILER_NVCC_H
10+
11+
#include <msgpack/predef/version_number.h>
12+
#include <msgpack/predef/make.h>
13+
14+
/*`
15+
[heading `MSGPACK_COMP_NVCC`]
16+
17+
[@https://en.wikipedia.org/wiki/NVIDIA_CUDA_Compiler NVCC] compiler.
18+
Version number available as major, minor, and patch beginning with version 7.5.
19+
20+
[table
21+
[[__predef_symbol__] [__predef_version__]]
22+
23+
[[`__NVCC__`] [__predef_detection__]]
24+
25+
[[`__CUDACC_VER_MAJOR__`, `__CUDACC_VER_MINOR__`, `__CUDACC_VER_BUILD__`] [V.R.P]]
26+
]
27+
*/
28+
29+
#define MSGPACK_COMP_NVCC MSGPACK_VERSION_NUMBER_NOT_AVAILABLE
30+
31+
#if defined(__NVCC__)
32+
# if !defined(__CUDACC_VER_MAJOR__) || !defined(__CUDACC_VER_MINOR__) || !defined(__CUDACC_VER_BUILD__)
33+
# define MSGPACK_COMP_NVCC_DETECTION MSGPACK_VERSION_NUMBER_AVAILABLE
34+
# else
35+
# define MSGPACK_COMP_NVCC_DETECTION MSGPACK_VERSION_NUMBER(__CUDACC_VER_MAJOR__, __CUDACC_VER_MINOR__, __CUDACC_VER_BUILD__)
36+
# endif
37+
#endif
38+
39+
#ifdef MSGPACK_COMP_NVCC_DETECTION
40+
# if defined(MSGPACK_PREDEF_DETAIL_COMP_DETECTED)
41+
# define MSGPACK_COMP_NVCC_EMULATED MSGPACK_COMP_NVCC_DETECTION
42+
# else
43+
# undef MSGPACK_COMP_NVCC
44+
# define MSGPACK_COMP_NVCC MSGPACK_COMP_NVCC_DETECTION
45+
# endif
46+
# define MSGPACK_COMP_NVCC_AVAILABLE
47+
# include <msgpack/predef/detail/comp_detected.h>
48+
#endif
49+
50+
#define MSGPACK_COMP_NVCC_NAME "NVCC"
51+
52+
#endif
53+
54+
#include <msgpack/predef/detail/test.h>
55+
MSGPACK_PREDEF_DECLARE_TEST(MSGPACK_COMP_NVCC,MSGPACK_COMP_NVCC_NAME)
56+
57+
#ifdef MSGPACK_COMP_NVCC_EMULATED
58+
#include <msgpack/predef/detail/test.h>
59+
MSGPACK_PREDEF_DECLARE_TEST(MSGPACK_COMP_NVCC_EMULATED,MSGPACK_COMP_NVCC_NAME)
60+
#endif

0 commit comments

Comments
 (0)