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

Fix includes to prevent testing system to fail

Browse Source
This commit is contained in:
Charly Chevalier
2015-07-15 21:16:04 +02:00
parent 40144e5c2b
commit d8e85aad16
5 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/boost/predef/hardware.h
View File

@ -6,8 +6,10 @@ Distributed under the Boost Software License, Version 1.0.
http://www.boost.org/LICENSE_1_0.txt) http://www.boost.org/LICENSE_1_0.txt)
*/ */
#if !defined(BOOST_PREDEF_HARDWARE_H) || defined(BOOST_PREDEF_INTERNAL_GENERATE_TESTS)
#ifndef BOOST_PREDEF_HARDWARE_H #ifndef BOOST_PREDEF_HARDWARE_H
#define BOOST_PREDEF_HARDWARE_H #define BOOST_PREDEF_HARDWARE_H
#endif
#include <boost/predef/hardware/simd.h> #include <boost/predef/hardware/simd.h>

8
include/boost/predef/hardware/simd.h
View File

@ -6,6 +6,10 @@ Distributed under the Boost Software License, Version 1.0.
http://www.boost.org/LICENSE_1_0.txt) http://www.boost.org/LICENSE_1_0.txt)
*/ */
#include <boost/predef/hardware/simd/x86.h>
#include <boost/predef/hardware/simd/arm.h>
#include <boost/predef/hardware/simd/ppc.h>
#ifndef BOOST_PREDEF_HARDWARE_SIMD_H #ifndef BOOST_PREDEF_HARDWARE_SIMD_H
#define BOOST_PREDEF_HARDWARE_SIMD_H #define BOOST_PREDEF_HARDWARE_SIMD_H
@ -26,10 +30,6 @@ http://www.boost.org/LICENSE_1_0.txt)
] ]
*/ */
#include <boost/predef/hardware/simd/x86.h>
#include <boost/predef/hardware/simd/arm.h>
#include <boost/predef/hardware/simd/ppc.h>
// We check if SIMD extension of multiples architectures have been detected, // We check if SIMD extension of multiples architectures have been detected,
// if yes, then this is an error! // if yes, then this is an error!
#if defined(BOOST_HW_SIMD_ARM_AVAILABLE) && defined(BOOST_HW_SIMD_PPC_AVAILABLE) ||\ #if defined(BOOST_HW_SIMD_ARM_AVAILABLE) && defined(BOOST_HW_SIMD_PPC_AVAILABLE) ||\

5
include/boost/predef/hardware/simd/arm.h
View File

@ -6,6 +6,9 @@ Distributed under the Boost Software License, Version 1.0.
http://www.boost.org/LICENSE_1_0.txt) http://www.boost.org/LICENSE_1_0.txt)
*/ */
// From the newest to the oldest
#include <boost/predef/hardware/simd/arm/neon.h>
#ifndef BOOST_PREDEF_HARDWARE_SIMD_ARM_H #ifndef BOOST_PREDEF_HARDWARE_SIMD_ARM_H
#define BOOST_PREDEF_HARDWARE_SIMD_ARM_H #define BOOST_PREDEF_HARDWARE_SIMD_ARM_H
@ -27,8 +30,6 @@ http://www.boost.org/LICENSE_1_0.txt)
] ]
*/ */
#include <boost/predef/hardware/simd/arm/neon.h>
#if defined(BOOST_HW_SIMD_ARM) #if defined(BOOST_HW_SIMD_ARM)
# define BOOST_HW_SIMD_ARM_AVAILABLE # define BOOST_HW_SIMD_ARM_AVAILABLE
#else #else

10
include/boost/predef/hardware/simd/ppc.h
View File

@ -6,6 +6,11 @@ Distributed under the Boost Software License, Version 1.0.
http://www.boost.org/LICENSE_1_0.txt) http://www.boost.org/LICENSE_1_0.txt)
*/ */
// From the newest to the oldest
#include <boost/predef/hardware/simd/ppc/qpx.h>
#include <boost/predef/hardware/simd/ppc/vsx.h>
#include <boost/predef/hardware/simd/ppc/vmx.h>
#ifndef BOOST_PREDEF_HARDWARE_SIMD_PPC_H #ifndef BOOST_PREDEF_HARDWARE_SIMD_PPC_H
#define BOOST_PREDEF_HARDWARE_SIMD_PPC_H #define BOOST_PREDEF_HARDWARE_SIMD_PPC_H
@ -28,11 +33,6 @@ http://www.boost.org/LICENSE_1_0.txt)
] ]
*/ */
// From the newest to the oldest
#include <boost/predef/hardware/simd/ppc/qpx.h>
#include <boost/predef/hardware/simd/ppc/vsx.h>
#include <boost/predef/hardware/simd/ppc/vmx.h>
#if defined(BOOST_HW_SIMD_PPC) #if defined(BOOST_HW_SIMD_PPC)
# define BOOST_HW_SIMD_PPC_AVAILABLE # define BOOST_HW_SIMD_PPC_AVAILABLE
#else #else

32
include/boost/predef/hardware/simd/x86.h
View File

@ -6,6 +6,22 @@ Distributed under the Boost Software License, Version 1.0.
http://www.boost.org/LICENSE_1_0.txt) http://www.boost.org/LICENSE_1_0.txt)
*/ */
// From the newest to the oldest
#include <boost/predef/hardware/simd/x86/mic.h> // XEON Phi specific
#include <boost/predef/hardware/simd/x86/avx2.h>
#include <boost/predef/hardware/simd/x86/fma3.h>
#include <boost/predef/hardware/simd/x86/xop.h> // AMD specific
#include <boost/predef/hardware/simd/x86/fma4.h> // AMD specific
#include <boost/predef/hardware/simd/x86/avx.h>
#include <boost/predef/hardware/simd/x86/sse4_2.h>
#include <boost/predef/hardware/simd/x86/sse4_1.h>
#include <boost/predef/hardware/simd/x86/sse4a.h> // AMD specific
#include <boost/predef/hardware/simd/x86/ssse3.h>
#include <boost/predef/hardware/simd/x86/sse3.h>
#include <boost/predef/hardware/simd/x86/sse2.h>
#include <boost/predef/hardware/simd/x86/sse.h>
#include <boost/predef/hardware/simd/x86/mmx.h>
#ifndef BOOST_PREDEF_HARDWARE_SIMD_X86_H #ifndef BOOST_PREDEF_HARDWARE_SIMD_X86_H
#define BOOST_PREDEF_HARDWARE_SIMD_X86_H #define BOOST_PREDEF_HARDWARE_SIMD_X86_H
@ -28,22 +44,6 @@ http://www.boost.org/LICENSE_1_0.txt)
] ]
*/ */
// From the newest to the oldest
#include <boost/predef/hardware/simd/x86/mic.h> // XEON Phi specific
#include <boost/predef/hardware/simd/x86/avx2.h>
#include <boost/predef/hardware/simd/x86/fma3.h>
#include <boost/predef/hardware/simd/x86/xop.h> // AMD specific
#include <boost/predef/hardware/simd/x86/fma4.h> // AMD specific
#include <boost/predef/hardware/simd/x86/avx.h>
#include <boost/predef/hardware/simd/x86/sse4_2.h>
#include <boost/predef/hardware/simd/x86/sse4_1.h>
#include <boost/predef/hardware/simd/x86/sse4a.h> // AMD specific
#include <boost/predef/hardware/simd/x86/ssse3.h>
#include <boost/predef/hardware/simd/x86/sse3.h>
#include <boost/predef/hardware/simd/x86/sse2.h>
#include <boost/predef/hardware/simd/x86/sse.h>
#include <boost/predef/hardware/simd/x86/mmx.h>
#if defined(BOOST_HW_SIMD_X86) #if defined(BOOST_HW_SIMD_X86)
# define BOOST_HW_SIMD_X86_AVAILABLE # define BOOST_HW_SIMD_X86_AVAILABLE
#else #else