Skip to content

Commit 585f330

Browse files
redboltzredboltz
committed
Merge pull request #475 from redboltz/update_boost_1_56_to_1_61
Updated boost predef and preprocessor from 1.58.0 to 1.61.0
2 parents 83dbe39 + 89faf6e commit 585f330

Some content is hidden

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

136 files changed

+1434
-426
lines changed

‎Files.cmake‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,17 @@ LIST (APPEND msgpackc_HEADERS
7171
include/msgpack/predef/detail/os_detected.h
7272
include/msgpack/predef/detail/platform_detected.h
7373
include/msgpack/predef/detail/test.h
74+
include/msgpack/predef/detail/test_def.h
75+
include/msgpack/predef/hardware.h
76+
include/msgpack/predef/hardware/simd.h
77+
include/msgpack/predef/hardware/simd/arm.h
78+
include/msgpack/predef/hardware/simd/arm/versions.h
79+
include/msgpack/predef/hardware/simd/ppc.h
80+
include/msgpack/predef/hardware/simd/ppc/versions.h
81+
include/msgpack/predef/hardware/simd/x86.h
82+
include/msgpack/predef/hardware/simd/x86/versions.h
83+
include/msgpack/predef/hardware/simd/x86_amd.h
84+
include/msgpack/predef/hardware/simd/x86_amd/versions.h
7485
include/msgpack/predef/language.h
7586
include/msgpack/predef/language/objc.h
7687
include/msgpack/predef/language/stdc.h
@@ -414,6 +425,7 @@ IF (MSGPACK_ENABLE_CXX)
414425
include/msgpack/preprocessor/seq.hpp
415426
include/msgpack/preprocessor/seq/cat.hpp
416427
include/msgpack/preprocessor/seq/detail/binary_transform.hpp
428+
include/msgpack/preprocessor/seq/detail/is_empty.hpp
417429
include/msgpack/preprocessor/seq/detail/split.hpp
418430
include/msgpack/preprocessor/seq/elem.hpp
419431
include/msgpack/preprocessor/seq/enum.hpp

‎external/boost/predef‎

Submodule predef updated 170 files

‎external/boost/preprocessor‎

Submodule preprocessor updated 32 files

‎include/msgpack/predef.h‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
/*
2-
Copyright Rene Rivera 2008-2013
2+
Copyright Rene Rivera 2008-2015
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)
66
*/
77

8+
#if !defined(MSGPACK_PREDEF_H) || defined(MSGPACK_PREDEF_INTERNAL_GENERATE_TESTS)
89
#ifndef MSGPACK_PREDEF_H
910
#define MSGPACK_PREDEF_H
11+
#endif
1012

1113
#include <msgpack/predef/language.h>
1214
#include <msgpack/predef/architecture.h>
@@ -15,5 +17,8 @@ Distributed under the Boost Software License, Version 1.0.
1517
#include <msgpack/predef/os.h>
1618
#include <msgpack/predef/other.h>
1719
#include <msgpack/predef/platform.h>
20+
#include <msgpack/predef/hardware.h>
21+
22+
#include <msgpack/predef/version.h>
1823

1924
#endif

‎include/msgpack/predef/architecture.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
/*
2-
Copyright Rene Rivera 2008-2013
2+
Copyright Rene Rivera 2008-2015
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)
66
*/
77

8+
#if !defined(MSGPACK_PREDEF_ARCHITECTURE_H) || defined(MSGPACK_PREDEF_INTERNAL_GENERATE_TESTS)
89
#ifndef MSGPACK_PREDEF_ARCHITECTURE_H
910
#define MSGPACK_PREDEF_ARCHITECTURE_H
11+
#endif
1012

1113
#include <msgpack/predef/architecture/alpha.h>
1214
#include <msgpack/predef/architecture/arm.h>

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright Rene Rivera 2008-2013
2+
Copyright Rene Rivera 2008-2015
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)
@@ -53,8 +53,7 @@ Distributed under the Boost Software License, Version 1.0.
5353

5454
#define MSGPACK_ARCH_ALPHA_NAME "DEC Alpha"
5555

56+
#endif
57+
5658
#include <msgpack/predef/detail/test.h>
5759
MSGPACK_PREDEF_DECLARE_TEST(MSGPACK_ARCH_ALPHA,MSGPACK_ARCH_ALPHA_NAME)
58-
59-
60-
#endif

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright Rene Rivera 2008-2013
2+
Copyright Rene Rivera 2008-2015
33
Copyright Franz Detro 2014
44
Copyright (c) Microsoft Corporation 2014
55
Distributed under the Boost Software License, Version 1.0.
@@ -64,8 +64,7 @@ Distributed under the Boost Software License, Version 1.0.
6464

6565
#define MSGPACK_ARCH_ARM_NAME "ARM"
6666

67+
#endif
68+
6769
#include <msgpack/predef/detail/test.h>
6870
MSGPACK_PREDEF_DECLARE_TEST(MSGPACK_ARCH_ARM,MSGPACK_ARCH_ARM_NAME)
69-
70-
71-
#endif

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright Rene Rivera 2013
2+
Copyright Rene Rivera 2013-2015
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)
@@ -40,8 +40,7 @@ Blackfin Processors from Analog Devices.
4040

4141
#define MSGPACK_ARCH_BLACKFIN_NAME "Blackfin"
4242

43+
#endif
44+
4345
#include <msgpack/predef/detail/test.h>
4446
MSGPACK_PREDEF_DECLARE_TEST(MSGPACK_ARCH_BLACKFIN,MSGPACK_ARCH_BLACKFIN_NAME)
45-
46-
47-
#endif

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright Rene Rivera 2011-2013
2+
Copyright Rene Rivera 2011-2015
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)
@@ -59,9 +59,7 @@ Distributed under the Boost Software License, Version 1.0.
5959

6060
#define MSGPACK_ARCH_CONVEX_NAME "Convex Computer"
6161

62+
#endif
63+
6264
#include <msgpack/predef/detail/test.h>
6365
MSGPACK_PREDEF_DECLARE_TEST(MSGPACK_ARCH_CONVEX,MSGPACK_ARCH_CONVEX_NAME)
64-
65-
66-
67-
#endif

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright Rene Rivera 2008-2013
2+
Copyright Rene Rivera 2008-2015
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)
@@ -43,7 +43,7 @@ Distributed under the Boost Software License, Version 1.0.
4343

4444
#define MSGPACK_ARCH_IA64_NAME "Intel Itanium 64"
4545

46+
#endif
47+
4648
#include <msgpack/predef/detail/test.h>
4749
MSGPACK_PREDEF_DECLARE_TEST(MSGPACK_ARCH_IA64,MSGPACK_ARCH_IA64_NAME)
48-
49-
#endif

0 commit comments

Comments
 (0)