diff --git a/sprout/algorithm/equal.hpp b/sprout/algorithm/equal.hpp index 8d9cb362..cd35924d 100644 --- a/sprout/algorithm/equal.hpp +++ b/sprout/algorithm/equal.hpp @@ -148,7 +148,7 @@ namespace sprout { first1, last1, first2, pred, sprout::distance(first1, last1) / 2 ) - ) + ) ; } diff --git a/sprout/algorithm/fixed/deprecated/sort.hpp b/sprout/algorithm/fixed/deprecated/sort.hpp index 836ac3b9..aad485a9 100644 --- a/sprout/algorithm/fixed/deprecated/sort.hpp +++ b/sprout/algorithm/fixed/deprecated/sort.hpp @@ -47,7 +47,7 @@ namespace sprout { typename sprout::container_traits::difference_type start, typename sprout::container_traits::difference_type end ) - { // select pivot (center) + { // select pivot (center) return *sprout::next(origin, (end + start) / 2); } template diff --git a/sprout/config/compiler/gcc.hpp b/sprout/config/compiler/gcc.hpp index d1537bca..4f6f883f 100644 --- a/sprout/config/compiler/gcc.hpp +++ b/sprout/config/compiler/gcc.hpp @@ -65,11 +65,11 @@ #endif #if !defined(__cpp_constexpr) || (__cpp_constexpr < 201304) -# define SPROUT_NO_CXX14_CONSTEXPR +# define SPROUT_NO_CXX14_CONSTEXPR #endif #if !defined(__cpp_variable_templates) || (__cpp_variable_templates < 201304) -# define SPROUT_NO_CXX14_VARIABLE_TEMPLATES +# define SPROUT_NO_CXX14_VARIABLE_TEMPLATES #endif #endif // #ifndef SPROUT_CONFIG_COMPILER_GCC_HPP diff --git a/sprout/config/compiler/visualc.hpp b/sprout/config/compiler/visualc.hpp index 2c3f3529..7b53869d 100644 --- a/sprout/config/compiler/visualc.hpp +++ b/sprout/config/compiler/visualc.hpp @@ -30,10 +30,10 @@ #define SPROUT_NO_CXX11_ATTRIBUTES #if !defined(__cpp_constexpr) || (__cpp_constexpr < 201304) -# define SPROUT_NO_CXX14_CONSTEXPR +# define SPROUT_NO_CXX14_CONSTEXPR #endif #if !defined(__cpp_variable_templates) || (__cpp_variable_templates < 201304) -# define SPROUT_NO_CXX14_VARIABLE_TEMPLATES +# define SPROUT_NO_CXX14_VARIABLE_TEMPLATES #endif #endif // #ifndef SPROUT_CONFIG_COMPILER_VISUALC_HPP diff --git a/sprout/config/stdlib/libstdcpp3.hpp b/sprout/config/stdlib/libstdcpp3.hpp index dbf15115..a74b3f05 100644 --- a/sprout/config/stdlib/libstdcpp3.hpp +++ b/sprout/config/stdlib/libstdcpp3.hpp @@ -9,7 +9,7 @@ #define SPROUT_CONFIG_STDLIB_LIBSTDCPP3_HPP #if defined(__GXX_EXPERIMENTAL_CXX0X__) || (__cplusplus >= 201103) -# define SPROUT_LIBSTDCXX11 +# define SPROUT_LIBSTDCXX11 #endif #if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 3) || !defined(SPROUT_LIBSTDCXX11) @@ -73,7 +73,7 @@ #endif #if defined(__clang_major__) && ((__clang_major__ < 3) || ((__clang_major__ == 3) && (__clang_minor__ < 7))) -# define SPROUT_NO_CXX11_HDR_ATOMIC +# define SPROUT_NO_CXX11_HDR_ATOMIC #endif #if __GNUC__ < 5 || (__GNUC__ == 5 && __GNUC_MINOR__ < 1) || !defined(SPROUT_LIBSTDCXX11) diff --git a/sprout/detail/one_type.hpp b/sprout/detail/one_type.hpp index 11a803b7..a2cf7665 100644 --- a/sprout/detail/one_type.hpp +++ b/sprout/detail/one_type.hpp @@ -22,7 +22,7 @@ namespace sprout { // struct not_one_type { public: - char padding[8]; + char padding[8]; }; } // namespace detail } // namespace sprout diff --git a/sprout/math/constant_variables.hpp b/sprout/math/constant_variables.hpp index 9420e2aa..bf1c3a46 100644 --- a/sprout/math/constant_variables.hpp +++ b/sprout/math/constant_variables.hpp @@ -11,7 +11,7 @@ #include #if SPROUT_USE_VARIABLE_TEMPLATES # include -#endif // #if SPROUT_USE_VARIABLE_TEMPLATES +#endif // #if SPROUT_USE_VARIABLE_TEMPLATES namespace sprout { namespace math { diff --git a/sprout/math/quaternion/quaternion.hpp b/sprout/math/quaternion/quaternion.hpp index e17aa719..ff476cc9 100644 --- a/sprout/math/quaternion/quaternion.hpp +++ b/sprout/math/quaternion/quaternion.hpp @@ -130,7 +130,7 @@ namespace sprout { SPROUT_CXX14_CONSTEXPR quaternion& operator+=(sprout::complex const& rhs) { T at = elems_[0] + rhs.real(); T bt = elems_[1] + rhs.imag(); - elems_[0] = at; + elems_[0] = at; elems_[1] = bt; return *this; } diff --git a/sprout/memory/exempt_ptr.hpp b/sprout/memory/exempt_ptr.hpp index a864775f..59505e41 100644 --- a/sprout/memory/exempt_ptr.hpp +++ b/sprout/memory/exempt_ptr.hpp @@ -369,7 +369,7 @@ namespace sprout { template inline SPROUT_NON_CONSTEXPR T* get_pointer(sprout::exempt_ptr const& p) SPROUT_NOEXCEPT { - return p.get(); + return p.get(); } } // namespace sprout diff --git a/sprout/memory/get_pointer.hpp b/sprout/memory/get_pointer.hpp index 917aabe7..783b9e95 100644 --- a/sprout/memory/get_pointer.hpp +++ b/sprout/memory/get_pointer.hpp @@ -18,26 +18,26 @@ namespace sprout { template inline SPROUT_CONSTEXPR T* get_pointer(T* p) SPROUT_NOEXCEPT { - return p; + return p; } template inline SPROUT_NON_CONSTEXPR T* get_pointer(std::auto_ptr const& p) SPROUT_NOEXCEPT { - return p.get(); + return p.get(); } #if !defined(SPROUT_NO_CXX11_SMART_PTR) template inline SPROUT_NON_CONSTEXPR T* get_pointer(std::unique_ptr const& p) SPROUT_NOEXCEPT { - return p.get(); + return p.get(); } template inline SPROUT_NON_CONSTEXPR T* get_pointer(std::shared_ptr const& p) SPROUT_NOEXCEPT { - return p.get(); + return p.get(); } #endif } // namespace sprout diff --git a/sprout/net/endian.hpp b/sprout/net/endian.hpp index 7a99a481..5f63e317 100644 --- a/sprout/net/endian.hpp +++ b/sprout/net/endian.hpp @@ -15,7 +15,7 @@ #include #include #include - + namespace sprout { namespace net { namespace detail { @@ -130,7 +130,7 @@ namespace sprout { reverse_words(T val) { return sprout::net::detail::reverse_words_impl(val, sizeof(T)); } - } // namespace detail + } // namespace detail // http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2013/n3620.pdf // template<> @@ -193,7 +193,7 @@ namespace sprout { ntohs SPROUT_PREVENT_MACRO_SUBSTITUTION (std::uint16_t net16) { return sprout::net::ntoh SPROUT_PREVENT_MACRO_SUBSTITUTION (net16); } - } //namespace net + } //namespace net } // namespace sprout #endif // #ifndef SPROUT_NET_ENDIAN_HPP diff --git a/sprout/predef/hardware.hpp b/sprout/predef/hardware.hpp index 5e7a1824..cb3649bd 100644 --- a/sprout/predef/hardware.hpp +++ b/sprout/predef/hardware.hpp @@ -1,14 +1,14 @@ -/*============================================================================= - Copyright (c) 2011-2016 Bolero MURAKAMI - https://github.com/bolero-MURAKAMI/Sprout - - Distributed under the sprout Software License, Version 1.0. (See accompanying - file LICENSE_1_0.txt or copy at http://www.sprout.org/LICENSE_1_0.txt) -=============================================================================*/ -#ifndef SPROUT_PREDEF_HARDWARE_HPP -#define SPROUT_PREDEF_HARDWARE_HPP - -#include -#include - -#endif // #ifndef SPROUT_PREDEF_HARDWARE_HPP +/*============================================================================= + Copyright (c) 2011-2016 Bolero MURAKAMI + https://github.com/bolero-MURAKAMI/Sprout + + Distributed under the sprout Software License, Version 1.0. (See accompanying + file LICENSE_1_0.txt or copy at http://www.sprout.org/LICENSE_1_0.txt) +=============================================================================*/ +#ifndef SPROUT_PREDEF_HARDWARE_HPP +#define SPROUT_PREDEF_HARDWARE_HPP + +#include +#include + +#endif // #ifndef SPROUT_PREDEF_HARDWARE_HPP diff --git a/sprout/predef/hardware/simd.hpp b/sprout/predef/hardware/simd.hpp index 2ac88167..027c5641 100644 --- a/sprout/predef/hardware/simd.hpp +++ b/sprout/predef/hardware/simd.hpp @@ -1,47 +1,47 @@ -/*============================================================================= - Copyright (c) 2011-2016 Bolero MURAKAMI - https://github.com/bolero-MURAKAMI/Sprout - - Distributed under the sprout Software License, Version 1.0. (See accompanying - file LICENSE_1_0.txt or copy at http://www.sprout.org/LICENSE_1_0.txt) -=============================================================================*/ -#ifndef SPROUT_PREDEF_HARDWARE_SIMD_HPP -#define SPROUT_PREDEF_HARDWARE_SIMD_HPP - -#include -#include -#include -#include -#include - -#if defined(SPROUT_HW_SIMD_ARM_AVAILABLE) && defined(SPROUT_HW_SIMD_PPC_AVAILABLE) \ - || defined(SPROUT_HW_SIMD_ARM_AVAILABLE) && defined(SPROUT_HW_SIMD_X86_AVAILABLE) \ - || defined(SPROUT_HW_SIMD_PPC_AVAILABLE) && defined(SPROUT_HW_SIMD_X86_AVAILABLE) -# error "Multiple SIMD architectures detected, this cannot happen!" -#endif - -#if defined(SPROUT_HW_SIMD_X86_AVAILABLE) -# define SPROUT_HW_SIMD SPROUT_HW_SIMD_X86 -#endif - -#if defined(SPROUT_HW_SIMD_X86_AMD_AVAILABLE) -# define SPROUT_HW_SIMD SPROUT_HW_SIMD_X86_AMD -#endif - -#if defined(SPROUT_HW_SIMD_ARM_AVAILABLE) -# define SPROUT_HW_SIMD SPROUT_HW_SIMD_ARM -#endif - -#if defined(SPROUT_HW_SIMD_PPC_AVAILABLE) -# define SPROUT_HW_SIMD SPROUT_HW_SIMD_PPC -#endif - -#if defined(SPROUT_HW_SIMD) -# define SPROUT_HW_SIMD_AVAILABLE -#else -# define SPROUT_HW_SIMD 0 -#endif - -#define SPROUT_HW_SIMD_NAME "Hardware SIMD" - -#endif // #ifndef SPROUT_PREDEF_HARDWARE_SIMD_HPP +/*============================================================================= + Copyright (c) 2011-2016 Bolero MURAKAMI + https://github.com/bolero-MURAKAMI/Sprout + + Distributed under the sprout Software License, Version 1.0. (See accompanying + file LICENSE_1_0.txt or copy at http://www.sprout.org/LICENSE_1_0.txt) +=============================================================================*/ +#ifndef SPROUT_PREDEF_HARDWARE_SIMD_HPP +#define SPROUT_PREDEF_HARDWARE_SIMD_HPP + +#include +#include +#include +#include +#include + +#if defined(SPROUT_HW_SIMD_ARM_AVAILABLE) && defined(SPROUT_HW_SIMD_PPC_AVAILABLE) \ + || defined(SPROUT_HW_SIMD_ARM_AVAILABLE) && defined(SPROUT_HW_SIMD_X86_AVAILABLE) \ + || defined(SPROUT_HW_SIMD_PPC_AVAILABLE) && defined(SPROUT_HW_SIMD_X86_AVAILABLE) +# error "Multiple SIMD architectures detected, this cannot happen!" +#endif + +#if defined(SPROUT_HW_SIMD_X86_AVAILABLE) +# define SPROUT_HW_SIMD SPROUT_HW_SIMD_X86 +#endif + +#if defined(SPROUT_HW_SIMD_X86_AMD_AVAILABLE) +# define SPROUT_HW_SIMD SPROUT_HW_SIMD_X86_AMD +#endif + +#if defined(SPROUT_HW_SIMD_ARM_AVAILABLE) +# define SPROUT_HW_SIMD SPROUT_HW_SIMD_ARM +#endif + +#if defined(SPROUT_HW_SIMD_PPC_AVAILABLE) +# define SPROUT_HW_SIMD SPROUT_HW_SIMD_PPC +#endif + +#if defined(SPROUT_HW_SIMD) +# define SPROUT_HW_SIMD_AVAILABLE +#else +# define SPROUT_HW_SIMD 0 +#endif + +#define SPROUT_HW_SIMD_NAME "Hardware SIMD" + +#endif // #ifndef SPROUT_PREDEF_HARDWARE_SIMD_HPP diff --git a/sprout/predef/hardware/simd/arm.hpp b/sprout/predef/hardware/simd/arm.hpp index 65009a33..607d00d6 100644 --- a/sprout/predef/hardware/simd/arm.hpp +++ b/sprout/predef/hardware/simd/arm.hpp @@ -1,29 +1,29 @@ -/*============================================================================= - Copyright (c) 2011-2016 Bolero MURAKAMI - https://github.com/bolero-MURAKAMI/Sprout - - Distributed under the sprout Software License, Version 1.0. (See accompanying - file LICENSE_1_0.txt or copy at http://www.sprout.org/LICENSE_1_0.txt) -=============================================================================*/ -#ifndef SPROUT_PREDEF_HARDWARE_SIMD_ARM_HPP -#define SPROUT_PREDEF_HARDWARE_SIMD_ARM_HPP - -#include -#include - -#define SPROUT_HW_SIMD_ARM 0 - -#undef SPROUT_HW_SIMD_ARM -#if !defined(SPROUT_HW_SIMD_ARM) && (defined(__ARM_NEON__) || defined(__aarch64__) || defined (_M_ARM)) -# define SPROUT_HW_SIMD_ARM SPROUT_HW_SIMD_ARM_NEON_VERSION -#endif - -#if !defined(SPROUT_HW_SIMD_ARM) -# define SPROUT_HW_SIMD_ARM 0 -#else -# define SPROUT_HW_SIMD_ARM_AVAILABLE -#endif - -#define SPROUT_HW_SIMD_ARM_NAME "ARM SIMD" - -#endif // #ifndef SPROUT_PREDEF_HARDWARE_SIMD_ARM_HPP +/*============================================================================= + Copyright (c) 2011-2016 Bolero MURAKAMI + https://github.com/bolero-MURAKAMI/Sprout + + Distributed under the sprout Software License, Version 1.0. (See accompanying + file LICENSE_1_0.txt or copy at http://www.sprout.org/LICENSE_1_0.txt) +=============================================================================*/ +#ifndef SPROUT_PREDEF_HARDWARE_SIMD_ARM_HPP +#define SPROUT_PREDEF_HARDWARE_SIMD_ARM_HPP + +#include +#include + +#define SPROUT_HW_SIMD_ARM 0 + +#undef SPROUT_HW_SIMD_ARM +#if !defined(SPROUT_HW_SIMD_ARM) && (defined(__ARM_NEON__) || defined(__aarch64__) || defined (_M_ARM)) +# define SPROUT_HW_SIMD_ARM SPROUT_HW_SIMD_ARM_NEON_VERSION +#endif + +#if !defined(SPROUT_HW_SIMD_ARM) +# define SPROUT_HW_SIMD_ARM 0 +#else +# define SPROUT_HW_SIMD_ARM_AVAILABLE +#endif + +#define SPROUT_HW_SIMD_ARM_NAME "ARM SIMD" + +#endif // #ifndef SPROUT_PREDEF_HARDWARE_SIMD_ARM_HPP diff --git a/sprout/predef/hardware/simd/arm/versions.hpp b/sprout/predef/hardware/simd/arm/versions.hpp index 44ac87ea..a0ed5ac2 100644 --- a/sprout/predef/hardware/simd/arm/versions.hpp +++ b/sprout/predef/hardware/simd/arm/versions.hpp @@ -1,16 +1,16 @@ -/*============================================================================= - Copyright (c) 2011-2016 Bolero MURAKAMI - https://github.com/bolero-MURAKAMI/Sprout - - Distributed under the sprout Software License, Version 1.0. (See accompanying - file LICENSE_1_0.txt or copy at http://www.sprout.org/LICENSE_1_0.txt) -=============================================================================*/ -#ifndef SPROUT_PREDEF_HARDWARE_SIMD_ARM_VERSIONS_HPP -#define SPROUT_PREDEF_HARDWARE_SIMD_ARM_VERSIONS_HPP - -#include -#include - -#define SPROUT_HW_SIMD_ARM_NEON_VERSION SPROUT_VERSION_NUMBER(1, 0, 0) - -#endif // #ifndef SPROUT_PREDEF_HARDWARE_SIMD_ARM_VERSIONS_HPP +/*============================================================================= + Copyright (c) 2011-2016 Bolero MURAKAMI + https://github.com/bolero-MURAKAMI/Sprout + + Distributed under the sprout Software License, Version 1.0. (See accompanying + file LICENSE_1_0.txt or copy at http://www.sprout.org/LICENSE_1_0.txt) +=============================================================================*/ +#ifndef SPROUT_PREDEF_HARDWARE_SIMD_ARM_VERSIONS_HPP +#define SPROUT_PREDEF_HARDWARE_SIMD_ARM_VERSIONS_HPP + +#include +#include + +#define SPROUT_HW_SIMD_ARM_NEON_VERSION SPROUT_VERSION_NUMBER(1, 0, 0) + +#endif // #ifndef SPROUT_PREDEF_HARDWARE_SIMD_ARM_VERSIONS_HPP diff --git a/sprout/predef/hardware/simd/ppc.hpp b/sprout/predef/hardware/simd/ppc.hpp index e516570b..32d26385 100644 --- a/sprout/predef/hardware/simd/ppc.hpp +++ b/sprout/predef/hardware/simd/ppc.hpp @@ -1,35 +1,35 @@ -/*============================================================================= - Copyright (c) 2011-2016 Bolero MURAKAMI - https://github.com/bolero-MURAKAMI/Sprout - - Distributed under the sprout Software License, Version 1.0. (See accompanying - file LICENSE_1_0.txt or copy at http://www.sprout.org/LICENSE_1_0.txt) -=============================================================================*/ -#ifndef SPROUT_PREDEF_HARDWARE_SIMD_PPC_HPP -#define SPROUT_PREDEF_HARDWARE_SIMD_PPC_HPP - -#include -#include - -#define SPROUT_HW_SIMD_PPC 0 - -#undef SPROUT_HW_SIMD_PPC -#if !defined(SPROUT_HW_SIMD_PPC) && defined(__VECTOR4DOUBLE__) -# define SPROUT_HW_SIMD_PPC SPROUT_HW_SIMD_PPC_QPX_VERSION -#endif -#if !defined(SPROUT_HW_SIMD_PPC) && defined(__VSX__) -# define SPROUT_HW_SIMD_PPC SPROUT_HW_SIMD_PPC_VSX_VERSION -#endif -#if !defined(SPROUT_HW_SIMD_PPC) && (defined(__ALTIVEC__) || defined(__VEC__)) -# define SPROUT_HW_SIMD_PPC SPROUT_HW_SIMD_PPC_VMX_VERSION -#endif - -#if !defined(SPROUT_HW_SIMD_PPC) -# define SPROUT_HW_SIMD_PPC 0 -#else -# define SPROUT_HW_SIMD_PPC_AVAILABLE -#endif - -#define SPROUT_HW_SIMD_PPC_NAME "PPC SIMD" - -#endif // #ifndef SPROUT_PREDEF_HARDWARE_SIMD_PPC_HPP +/*============================================================================= + Copyright (c) 2011-2016 Bolero MURAKAMI + https://github.com/bolero-MURAKAMI/Sprout + + Distributed under the sprout Software License, Version 1.0. (See accompanying + file LICENSE_1_0.txt or copy at http://www.sprout.org/LICENSE_1_0.txt) +=============================================================================*/ +#ifndef SPROUT_PREDEF_HARDWARE_SIMD_PPC_HPP +#define SPROUT_PREDEF_HARDWARE_SIMD_PPC_HPP + +#include +#include + +#define SPROUT_HW_SIMD_PPC 0 + +#undef SPROUT_HW_SIMD_PPC +#if !defined(SPROUT_HW_SIMD_PPC) && defined(__VECTOR4DOUBLE__) +# define SPROUT_HW_SIMD_PPC SPROUT_HW_SIMD_PPC_QPX_VERSION +#endif +#if !defined(SPROUT_HW_SIMD_PPC) && defined(__VSX__) +# define SPROUT_HW_SIMD_PPC SPROUT_HW_SIMD_PPC_VSX_VERSION +#endif +#if !defined(SPROUT_HW_SIMD_PPC) && (defined(__ALTIVEC__) || defined(__VEC__)) +# define SPROUT_HW_SIMD_PPC SPROUT_HW_SIMD_PPC_VMX_VERSION +#endif + +#if !defined(SPROUT_HW_SIMD_PPC) +# define SPROUT_HW_SIMD_PPC 0 +#else +# define SPROUT_HW_SIMD_PPC_AVAILABLE +#endif + +#define SPROUT_HW_SIMD_PPC_NAME "PPC SIMD" + +#endif // #ifndef SPROUT_PREDEF_HARDWARE_SIMD_PPC_HPP diff --git a/sprout/predef/hardware/simd/ppc/versions.hpp b/sprout/predef/hardware/simd/ppc/versions.hpp index f88b6f89..0e3174a4 100644 --- a/sprout/predef/hardware/simd/ppc/versions.hpp +++ b/sprout/predef/hardware/simd/ppc/versions.hpp @@ -1,20 +1,20 @@ -/*============================================================================= - Copyright (c) 2011-2016 Bolero MURAKAMI - https://github.com/bolero-MURAKAMI/Sprout - - Distributed under the sprout Software License, Version 1.0. (See accompanying - file LICENSE_1_0.txt or copy at http://www.sprout.org/LICENSE_1_0.txt) -=============================================================================*/ -#ifndef SPROUT_PREDEF_HARDWARE_SIMD_PPC_VERSIONS_HPP -#define SPROUT_PREDEF_HARDWARE_SIMD_PPC_VERSIONS_HPP - -#include -#include - -#define SPROUT_HW_SIMD_PPC_VMX_VERSION SPROUT_VERSION_NUMBER(1, 0, 0) - -#define SPROUT_HW_SIMD_PPC_VSX_VERSION SPROUT_VERSION_NUMBER(1, 1, 0) - -#define SPROUT_HW_SIMD_PPC_QPX_VERSION SPROUT_VERSION_NUMBER(2, 0, 0) - -#endif // #ifndef SPROUT_PREDEF_HARDWARE_SIMD_PPC_VERSIONS_HPP +/*============================================================================= + Copyright (c) 2011-2016 Bolero MURAKAMI + https://github.com/bolero-MURAKAMI/Sprout + + Distributed under the sprout Software License, Version 1.0. (See accompanying + file LICENSE_1_0.txt or copy at http://www.sprout.org/LICENSE_1_0.txt) +=============================================================================*/ +#ifndef SPROUT_PREDEF_HARDWARE_SIMD_PPC_VERSIONS_HPP +#define SPROUT_PREDEF_HARDWARE_SIMD_PPC_VERSIONS_HPP + +#include +#include + +#define SPROUT_HW_SIMD_PPC_VMX_VERSION SPROUT_VERSION_NUMBER(1, 0, 0) + +#define SPROUT_HW_SIMD_PPC_VSX_VERSION SPROUT_VERSION_NUMBER(1, 1, 0) + +#define SPROUT_HW_SIMD_PPC_QPX_VERSION SPROUT_VERSION_NUMBER(2, 0, 0) + +#endif // #ifndef SPROUT_PREDEF_HARDWARE_SIMD_PPC_VERSIONS_HPP diff --git a/sprout/predef/hardware/simd/x86.hpp b/sprout/predef/hardware/simd/x86.hpp index 7c15452e..093b64be 100644 --- a/sprout/predef/hardware/simd/x86.hpp +++ b/sprout/predef/hardware/simd/x86.hpp @@ -1,59 +1,59 @@ -/*============================================================================= - Copyright (c) 2011-2016 Bolero MURAKAMI - https://github.com/bolero-MURAKAMI/Sprout - - Distributed under the sprout Software License, Version 1.0. (See accompanying - file LICENSE_1_0.txt or copy at http://www.sprout.org/LICENSE_1_0.txt) -=============================================================================*/ -#ifndef SPROUT_PREDEF_HARDWARE_SIMD_X86_HPP -#define SPROUT_PREDEF_HARDWARE_SIMD_X86_HPP - -#include -#include - -#define SPROUT_HW_SIMD_X86 0 - -#undef SPROUT_HW_SIMD_X86 -#if !defined(SPROUT_HW_SIMD_X86) && defined(__MIC__) -# define SPROUT_HW_SIMD_X86 SPROUT_HW_SIMD_X86_MIC_VERSION -#endif -#if !defined(SPROUT_HW_SIMD_X86) && defined(__AVX2__) -# define SPROUT_HW_SIMD_X86 SPROUT_HW_SIMD_X86_AVX2_VERSION -#endif -#if !defined(SPROUT_HW_SIMD_X86) && defined(__AVX__) -# define SPROUT_HW_SIMD_X86 SPROUT_HW_SIMD_X86_AVX_VERSION -#endif -#if !defined(SPROUT_HW_SIMD_X86) && defined(__FMA__) -# define SPROUT_HW_SIMD_X86 SPROUT_HW_SIMD_X86_FMA_VERSION -#endif -#if !defined(SPROUT_HW_SIMD_X86) && defined(__SSE4_2__) -# define SPROUT_HW_SIMD_X86 SPROUT_HW_SIMD_X86_SSE4_2_VERSION -#endif -#if !defined(SPROUT_HW_SIMD_X86) && defined(__SSE4_1__) -# define SPROUT_HW_SIMD_X86 SPROUT_HW_SIMD_X86_SSE4_1_VERSION -#endif -#if !defined(SPROUT_HW_SIMD_X86) && defined(__SSSE3__) -# define SPROUT_HW_SIMD_X86 SPROUT_HW_SIMD_X86_SSSE3_VERSION -#endif -#if !defined(SPROUT_HW_SIMD_X86) && defined(__SSE3__) -# define SPROUT_HW_SIMD_X86 SPROUT_HW_SIMD_X86_SSE3_VERSION -#endif -#if !defined(SPROUT_HW_SIMD_X86) && (defined(__SSE2__) || defined(_M_X64) || _M_IX86_FP >= 2) -# define SPROUT_HW_SIMD_X86 SPROUT_HW_SIMD_X86_SSE2_VERSION -#endif -#if !defined(SPROUT_HW_SIMD_X86) && (defined(__SSE__) || defined(_M_X64) || _M_IX86_FP >= 1) -# define SPROUT_HW_SIMD_X86 SPROUT_HW_SIMD_X86_SSE_VERSION -#endif -#if !defined(SPROUT_HW_SIMD_X86) && defined(__MMX__) -# define SPROUT_HW_SIMD_X86 SPROUT_HW_SIMD_X86_MMX_VERSION -#endif - -#if !defined(SPROUT_HW_SIMD_X86) -# define SPROUT_HW_SIMD_X86 0 -#else -# define SPROUT_HW_SIMD_X86_AVAILABLE -#endif - -#define SPROUT_HW_SIMD_X86_NAME "x86 SIMD" - -#endif // #ifndef SPROUT_PREDEF_HARDWARE_SIMD_X86_HPP +/*============================================================================= + Copyright (c) 2011-2016 Bolero MURAKAMI + https://github.com/bolero-MURAKAMI/Sprout + + Distributed under the sprout Software License, Version 1.0. (See accompanying + file LICENSE_1_0.txt or copy at http://www.sprout.org/LICENSE_1_0.txt) +=============================================================================*/ +#ifndef SPROUT_PREDEF_HARDWARE_SIMD_X86_HPP +#define SPROUT_PREDEF_HARDWARE_SIMD_X86_HPP + +#include +#include + +#define SPROUT_HW_SIMD_X86 0 + +#undef SPROUT_HW_SIMD_X86 +#if !defined(SPROUT_HW_SIMD_X86) && defined(__MIC__) +# define SPROUT_HW_SIMD_X86 SPROUT_HW_SIMD_X86_MIC_VERSION +#endif +#if !defined(SPROUT_HW_SIMD_X86) && defined(__AVX2__) +# define SPROUT_HW_SIMD_X86 SPROUT_HW_SIMD_X86_AVX2_VERSION +#endif +#if !defined(SPROUT_HW_SIMD_X86) && defined(__AVX__) +# define SPROUT_HW_SIMD_X86 SPROUT_HW_SIMD_X86_AVX_VERSION +#endif +#if !defined(SPROUT_HW_SIMD_X86) && defined(__FMA__) +# define SPROUT_HW_SIMD_X86 SPROUT_HW_SIMD_X86_FMA_VERSION +#endif +#if !defined(SPROUT_HW_SIMD_X86) && defined(__SSE4_2__) +# define SPROUT_HW_SIMD_X86 SPROUT_HW_SIMD_X86_SSE4_2_VERSION +#endif +#if !defined(SPROUT_HW_SIMD_X86) && defined(__SSE4_1__) +# define SPROUT_HW_SIMD_X86 SPROUT_HW_SIMD_X86_SSE4_1_VERSION +#endif +#if !defined(SPROUT_HW_SIMD_X86) && defined(__SSSE3__) +# define SPROUT_HW_SIMD_X86 SPROUT_HW_SIMD_X86_SSSE3_VERSION +#endif +#if !defined(SPROUT_HW_SIMD_X86) && defined(__SSE3__) +# define SPROUT_HW_SIMD_X86 SPROUT_HW_SIMD_X86_SSE3_VERSION +#endif +#if !defined(SPROUT_HW_SIMD_X86) && (defined(__SSE2__) || defined(_M_X64) || _M_IX86_FP >= 2) +# define SPROUT_HW_SIMD_X86 SPROUT_HW_SIMD_X86_SSE2_VERSION +#endif +#if !defined(SPROUT_HW_SIMD_X86) && (defined(__SSE__) || defined(_M_X64) || _M_IX86_FP >= 1) +# define SPROUT_HW_SIMD_X86 SPROUT_HW_SIMD_X86_SSE_VERSION +#endif +#if !defined(SPROUT_HW_SIMD_X86) && defined(__MMX__) +# define SPROUT_HW_SIMD_X86 SPROUT_HW_SIMD_X86_MMX_VERSION +#endif + +#if !defined(SPROUT_HW_SIMD_X86) +# define SPROUT_HW_SIMD_X86 0 +#else +# define SPROUT_HW_SIMD_X86_AVAILABLE +#endif + +#define SPROUT_HW_SIMD_X86_NAME "x86 SIMD" + +#endif // #ifndef SPROUT_PREDEF_HARDWARE_SIMD_X86_HPP diff --git a/sprout/predef/hardware/simd/x86/versions.hpp b/sprout/predef/hardware/simd/x86/versions.hpp index d04ccce2..fc36ac80 100644 --- a/sprout/predef/hardware/simd/x86/versions.hpp +++ b/sprout/predef/hardware/simd/x86/versions.hpp @@ -1,36 +1,36 @@ -/*============================================================================= - Copyright (c) 2011-2016 Bolero MURAKAMI - https://github.com/bolero-MURAKAMI/Sprout - - Distributed under the sprout Software License, Version 1.0. (See accompanying - file LICENSE_1_0.txt or copy at http://www.sprout.org/LICENSE_1_0.txt) -=============================================================================*/ -#ifndef SPROUT_PREDEF_HARDWARE_SIMD_X86_VERSIONS_HPP -#define SPROUT_PREDEF_HARDWARE_SIMD_X86_VERSIONS_HPP - -#include -#include - -#define SPROUT_HW_SIMD_X86_MMX_VERSION SPROUT_VERSION_NUMBER(0, 99, 0) - -#define SPROUT_HW_SIMD_X86_SSE_VERSION SPROUT_VERSION_NUMBER(1, 0, 0) - -#define SPROUT_HW_SIMD_X86_SSE2_VERSION SPROUT_VERSION_NUMBER(2, 0, 0) - -#define SPROUT_HW_SIMD_X86_SSE3_VERSION SPROUT_VERSION_NUMBER(3, 0, 0) - -#define SPROUT_HW_SIMD_X86_SSSE3_VERSION SPROUT_VERSION_NUMBER(3, 1, 0) - -#define SPROUT_HW_SIMD_X86_SSE4_1_VERSION SPROUT_VERSION_NUMBER(4, 1, 0) - -#define SPROUT_HW_SIMD_X86_SSE4_2_VERSION SPROUT_VERSION_NUMBER(4, 2, 0) - -#define SPROUT_HW_SIMD_X86_AVX_VERSION SPROUT_VERSION_NUMBER(5, 0, 0) - -#define SPROUT_HW_SIMD_X86_FMA3_VERSION SPROUT_VERSION_NUMBER(5, 2, 0) - -#define SPROUT_HW_SIMD_X86_AVX2_VERSION SPROUT_VERSION_NUMBER(5, 3, 0) - -#define SPROUT_HW_SIMD_X86_MIC_VERSION SPROUT_VERSION_NUMBER(9, 0, 0) - -#endif // #ifndef SPROUT_PREDEF_HARDWARE_SIMD_X86_VERSIONS_HPP +/*============================================================================= + Copyright (c) 2011-2016 Bolero MURAKAMI + https://github.com/bolero-MURAKAMI/Sprout + + Distributed under the sprout Software License, Version 1.0. (See accompanying + file LICENSE_1_0.txt or copy at http://www.sprout.org/LICENSE_1_0.txt) +=============================================================================*/ +#ifndef SPROUT_PREDEF_HARDWARE_SIMD_X86_VERSIONS_HPP +#define SPROUT_PREDEF_HARDWARE_SIMD_X86_VERSIONS_HPP + +#include +#include + +#define SPROUT_HW_SIMD_X86_MMX_VERSION SPROUT_VERSION_NUMBER(0, 99, 0) + +#define SPROUT_HW_SIMD_X86_SSE_VERSION SPROUT_VERSION_NUMBER(1, 0, 0) + +#define SPROUT_HW_SIMD_X86_SSE2_VERSION SPROUT_VERSION_NUMBER(2, 0, 0) + +#define SPROUT_HW_SIMD_X86_SSE3_VERSION SPROUT_VERSION_NUMBER(3, 0, 0) + +#define SPROUT_HW_SIMD_X86_SSSE3_VERSION SPROUT_VERSION_NUMBER(3, 1, 0) + +#define SPROUT_HW_SIMD_X86_SSE4_1_VERSION SPROUT_VERSION_NUMBER(4, 1, 0) + +#define SPROUT_HW_SIMD_X86_SSE4_2_VERSION SPROUT_VERSION_NUMBER(4, 2, 0) + +#define SPROUT_HW_SIMD_X86_AVX_VERSION SPROUT_VERSION_NUMBER(5, 0, 0) + +#define SPROUT_HW_SIMD_X86_FMA3_VERSION SPROUT_VERSION_NUMBER(5, 2, 0) + +#define SPROUT_HW_SIMD_X86_AVX2_VERSION SPROUT_VERSION_NUMBER(5, 3, 0) + +#define SPROUT_HW_SIMD_X86_MIC_VERSION SPROUT_VERSION_NUMBER(9, 0, 0) + +#endif // #ifndef SPROUT_PREDEF_HARDWARE_SIMD_X86_VERSIONS_HPP diff --git a/sprout/predef/hardware/simd/x86_amd.hpp b/sprout/predef/hardware/simd/x86_amd.hpp index f61c4e4a..b8200570 100644 --- a/sprout/predef/hardware/simd/x86_amd.hpp +++ b/sprout/predef/hardware/simd/x86_amd.hpp @@ -1,40 +1,40 @@ -/*============================================================================= - Copyright (c) 2011-2016 Bolero MURAKAMI - https://github.com/bolero-MURAKAMI/Sprout - - Distributed under the sprout Software License, Version 1.0. (See accompanying - file LICENSE_1_0.txt or copy at http://www.sprout.org/LICENSE_1_0.txt) -=============================================================================*/ -#ifndef SPROUT_PREDEF_HARDWARE_SIMD_X86_AMD_HPP -#define SPROUT_PREDEF_HARDWARE_SIMD_X86_AMD_HPP - -#include -#include - -#define SPROUT_HW_SIMD_X86_AMD 0 - -#undef SPROUT_HW_SIMD_X86_AMD -#if !defined(SPROUT_HW_SIMD_X86_AMD) && defined(__XOP__) -# define SPROUT_HW_SIMD_X86_AMD SPROUT_HW_SIMD_X86_AMD_XOP_VERSION -#endif -#if !defined(SPROUT_HW_SIMD_X86_AMD) && defined(__FMA4__) -# define SPROUT_HW_SIMD_X86_AMD SPROUT_HW_SIMD_X86_AMD_FMA4_VERSION -#endif -#if !defined(SPROUT_HW_SIMD_X86_AMD) && defined(__SSE4A__) -# define SPROUT_HW_SIMD_X86_AMD SPROUT_HW_SIMD_X86_AMD_SSE4A_VERSION -#endif - -#if !defined(SPROUT_HW_SIMD_X86_AMD) -# define SPROUT_HW_SIMD_X86_AMD 0 -#else -# include -# if SPROUT_HW_SIMD_X86 > SPROUT_HW_SIMD_X86_AMD -# undef SPROUT_HW_SIMD_X86_AMD -# define SPROUT_HW_SIMD_X86_AMD SPROUT_HW_SIMD_X86 -# endif -# define SPROUT_HW_SIMD_X86_AMD_AVAILABLE -#endif - -#define SPROUT_HW_SIMD_X86_AMD_NAME "x86 (AMD) SIMD" - -#endif // #ifndef SPROUT_PREDEF_HARDWARE_SIMD_X86_AMD_HPP +/*============================================================================= + Copyright (c) 2011-2016 Bolero MURAKAMI + https://github.com/bolero-MURAKAMI/Sprout + + Distributed under the sprout Software License, Version 1.0. (See accompanying + file LICENSE_1_0.txt or copy at http://www.sprout.org/LICENSE_1_0.txt) +=============================================================================*/ +#ifndef SPROUT_PREDEF_HARDWARE_SIMD_X86_AMD_HPP +#define SPROUT_PREDEF_HARDWARE_SIMD_X86_AMD_HPP + +#include +#include + +#define SPROUT_HW_SIMD_X86_AMD 0 + +#undef SPROUT_HW_SIMD_X86_AMD +#if !defined(SPROUT_HW_SIMD_X86_AMD) && defined(__XOP__) +# define SPROUT_HW_SIMD_X86_AMD SPROUT_HW_SIMD_X86_AMD_XOP_VERSION +#endif +#if !defined(SPROUT_HW_SIMD_X86_AMD) && defined(__FMA4__) +# define SPROUT_HW_SIMD_X86_AMD SPROUT_HW_SIMD_X86_AMD_FMA4_VERSION +#endif +#if !defined(SPROUT_HW_SIMD_X86_AMD) && defined(__SSE4A__) +# define SPROUT_HW_SIMD_X86_AMD SPROUT_HW_SIMD_X86_AMD_SSE4A_VERSION +#endif + +#if !defined(SPROUT_HW_SIMD_X86_AMD) +# define SPROUT_HW_SIMD_X86_AMD 0 +#else +# include +# if SPROUT_HW_SIMD_X86 > SPROUT_HW_SIMD_X86_AMD +# undef SPROUT_HW_SIMD_X86_AMD +# define SPROUT_HW_SIMD_X86_AMD SPROUT_HW_SIMD_X86 +# endif +# define SPROUT_HW_SIMD_X86_AMD_AVAILABLE +#endif + +#define SPROUT_HW_SIMD_X86_AMD_NAME "x86 (AMD) SIMD" + +#endif // #ifndef SPROUT_PREDEF_HARDWARE_SIMD_X86_AMD_HPP diff --git a/sprout/predef/hardware/simd/x86_amd/versions.hpp b/sprout/predef/hardware/simd/x86_amd/versions.hpp index 78531891..f1159c31 100644 --- a/sprout/predef/hardware/simd/x86_amd/versions.hpp +++ b/sprout/predef/hardware/simd/x86_amd/versions.hpp @@ -1,20 +1,20 @@ -/*============================================================================= - Copyright (c) 2011-2016 Bolero MURAKAMI - https://github.com/bolero-MURAKAMI/Sprout - - Distributed under the sprout Software License, Version 1.0. (See accompanying - file LICENSE_1_0.txt or copy at http://www.sprout.org/LICENSE_1_0.txt) -=============================================================================*/ -#ifndef SPROUT_PREDEF_HARDWARE_SIMD_X86_AMD_VERSIONS_HPP -#define SPROUT_PREDEF_HARDWARE_SIMD_X86_AMD_VERSIONS_HPP - -#include -#include - -#define SPROUT_HW_SIMD_X86_AMD_SSE4A_VERSION SPROUT_VERSION_NUMBER(4, 0, 0) - -#define SPROUT_HW_SIMD_X86_AMD_FMA4_VERSION SPROUT_VERSION_NUMBER(5, 1, 0) - -#define SPROUT_HW_SIMD_X86_AMD_XOP_VERSION SPROUT_VERSION_NUMBER(5, 1, 1) - -#endif // #ifndef SPROUT_PREDEF_HARDWARE_SIMD_X86_AMD_VERSIONS_HPP +/*============================================================================= + Copyright (c) 2011-2016 Bolero MURAKAMI + https://github.com/bolero-MURAKAMI/Sprout + + Distributed under the sprout Software License, Version 1.0. (See accompanying + file LICENSE_1_0.txt or copy at http://www.sprout.org/LICENSE_1_0.txt) +=============================================================================*/ +#ifndef SPROUT_PREDEF_HARDWARE_SIMD_X86_AMD_VERSIONS_HPP +#define SPROUT_PREDEF_HARDWARE_SIMD_X86_AMD_VERSIONS_HPP + +#include +#include + +#define SPROUT_HW_SIMD_X86_AMD_SSE4A_VERSION SPROUT_VERSION_NUMBER(4, 0, 0) + +#define SPROUT_HW_SIMD_X86_AMD_FMA4_VERSION SPROUT_VERSION_NUMBER(5, 1, 0) + +#define SPROUT_HW_SIMD_X86_AMD_XOP_VERSION SPROUT_VERSION_NUMBER(5, 1, 1) + +#endif // #ifndef SPROUT_PREDEF_HARDWARE_SIMD_X86_AMD_VERSIONS_HPP diff --git a/sprout/predef/language/objc.hpp b/sprout/predef/language/objc.hpp index 69531976..c0aed49b 100644 --- a/sprout/predef/language/objc.hpp +++ b/sprout/predef/language/objc.hpp @@ -13,12 +13,12 @@ #define SPROUT_LANG_OBJC 0 #if defined(__OBJC__) -# undef SPROUT_LANG_OBJC -# define SPROUT_LANG_OBJC 1 +# undef SPROUT_LANG_OBJC +# define SPROUT_LANG_OBJC 1 #endif #if SPROUT_LANG_OBJC -# define SPROUT_LANG_OBJC_AVAILABLE +# define SPROUT_LANG_OBJC_AVAILABLE #endif #define SPROUT_LANG_OBJC_NAME "Objective-C" diff --git a/sprout/predef/language/stdc.hpp b/sprout/predef/language/stdc.hpp index b7c0e53d..a7ccc3b2 100644 --- a/sprout/predef/language/stdc.hpp +++ b/sprout/predef/language/stdc.hpp @@ -14,20 +14,20 @@ #define SPROUT_LANG_STDC 0 #if defined(__STDC__) -# undef SPROUT_LANG_STDC -# if defined(__STDC_VERSION__) -# if (__STDC_VERSION__ > 100) -# define SPROUT_LANG_STDC SPROUT_PREDEF_MAKE_YYYYMM(__STDC_VERSION__) -# else -# define SPROUT_LANG_STDC 1 -# endif -# else -# define SPROUT_LANG_STDC 1 -# endif +# undef SPROUT_LANG_STDC +# if defined(__STDC_VERSION__) +# if (__STDC_VERSION__ > 100) +# define SPROUT_LANG_STDC SPROUT_PREDEF_MAKE_YYYYMM(__STDC_VERSION__) +# else +# define SPROUT_LANG_STDC 1 +# endif +# else +# define SPROUT_LANG_STDC 1 +# endif #endif #if SPROUT_LANG_STDC -# define SPROUT_LANG_STDC_AVAILABLE +# define SPROUT_LANG_STDC_AVAILABLE #endif #define SPROUT_LANG_STDC_NAME "Standard C" diff --git a/sprout/predef/language/stdcpp.hpp b/sprout/predef/language/stdcpp.hpp index ac518959..ef997c2b 100644 --- a/sprout/predef/language/stdcpp.hpp +++ b/sprout/predef/language/stdcpp.hpp @@ -14,16 +14,16 @@ #define SPROUT_LANG_STDCPP 0 #if defined(__cplusplus) -# undef SPROUT_LANG_STDCPP -# if (__cplusplus > 100) -# define SPROUT_LANG_STDCPP SPROUT_PREDEF_MAKE_YYYYMM(__cplusplus) -# else -# define SPROUT_LANG_STDCPP 1 -# endif +# undef SPROUT_LANG_STDCPP +# if (__cplusplus > 100) +# define SPROUT_LANG_STDCPP SPROUT_PREDEF_MAKE_YYYYMM(__cplusplus) +# else +# define SPROUT_LANG_STDCPP 1 +# endif #endif #if SPROUT_LANG_STDCPP -# define SPROUT_LANG_STDCPP_AVAILABLE +# define SPROUT_LANG_STDCPP_AVAILABLE #endif #define SPROUT_LANG_STDCPP_NAME "Standard C++" @@ -31,16 +31,16 @@ #define SPROUT_LANG_STDCPPCLI 0 #if defined(__cplusplus_cli) -# undef SPROUT_LANG_STDCPPCLI -# if (__cplusplus_cli > 100) -# define SPROUT_LANG_STDCPPCLI SPROUT_PREDEF_MAKE_YYYYMM(__cplusplus_cli) -# else -# define SPROUT_LANG_STDCPPCLI 1 -# endif +# undef SPROUT_LANG_STDCPPCLI +# if (__cplusplus_cli > 100) +# define SPROUT_LANG_STDCPPCLI SPROUT_PREDEF_MAKE_YYYYMM(__cplusplus_cli) +# else +# define SPROUT_LANG_STDCPPCLI 1 +# endif #endif #if SPROUT_LANG_STDCPPCLI -# define SPROUT_LANG_STDCPPCLI_AVAILABLE +# define SPROUT_LANG_STDCPPCLI_AVAILABLE #endif #define SPROUT_LANG_STDCPPCLI_NAME "Standard C++/CLI" @@ -48,12 +48,12 @@ #define SPROUT_LANG_STDECPP 0 #if defined(__embedded_cplusplus) -# undef SPROUT_LANG_STDECPP -# define SPROUT_LANG_STDECPP 1 +# undef SPROUT_LANG_STDECPP +# define SPROUT_LANG_STDECPP 1 #endif #if SPROUT_LANG_STDECPP -# define SPROUT_LANG_STDECPP_AVAILABLE +# define SPROUT_LANG_STDECPP_AVAILABLE #endif #define SPROUT_LANG_STDECPP_NAME "Standard Embedded C++" diff --git a/sprout/predef/platform/windows_desktop.hpp b/sprout/predef/platform/windows_desktop.hpp index b95cc14c..49c3b8ed 100644 --- a/sprout/predef/platform/windows_desktop.hpp +++ b/sprout/predef/platform/windows_desktop.hpp @@ -17,7 +17,7 @@ # undef SPROUT_PLAT_WINDOWS_DESKTOP # define SPROUT_PLAT_WINDOWS_DESKTOP 1 #endif - + #if SPROUT_PLAT_WINDOWS_DESKTOP # define SPROUT_PLAT_WINDOWS_DESKTOP_AVALIABLE # include diff --git a/sprout/predef/platform/windows_phone.hpp b/sprout/predef/platform/windows_phone.hpp index ad7674c7..2a0251bb 100644 --- a/sprout/predef/platform/windows_phone.hpp +++ b/sprout/predef/platform/windows_phone.hpp @@ -17,7 +17,7 @@ # undef SPROUT_PLAT_WINDOWS_PHONE # define SPROUT_PLAT_WINDOWS_PHONE 1 #endif - + #if SPROUT_PLAT_WINDOWS_PHONE # define SPROUT_PLAT_WINDOWS_PHONE_AVALIABLE # include diff --git a/sprout/predef/platform/windows_runtime.hpp b/sprout/predef/platform/windows_runtime.hpp index 556026d8..f3fe42a2 100644 --- a/sprout/predef/platform/windows_runtime.hpp +++ b/sprout/predef/platform/windows_runtime.hpp @@ -17,7 +17,7 @@ # undef SPROUT_PLAT_WINDOWS_RUNTIME # define SPROUT_PLAT_WINDOWS_RUNTIME 1 #endif - + #if SPROUT_PLAT_WINDOWS_RUNTIME # define SPROUT_PLAT_WINDOWS_RUNTIME_AVALIABLE # include diff --git a/sprout/predef/platform/windows_store.hpp b/sprout/predef/platform/windows_store.hpp index b2ea91fb..dbadc93a 100644 --- a/sprout/predef/platform/windows_store.hpp +++ b/sprout/predef/platform/windows_store.hpp @@ -17,7 +17,7 @@ # undef SPROUT_PLAT_WINDOWS_STORE # define SPROUT_PLAT_WINDOWS_STORE 1 #endif - + #if SPROUT_PLAT_WINDOWS_STORE # define SPROUT_PLAT_WINDOWS_STORE_AVALIABLE # include diff --git a/sprout/predef/version_number.hpp b/sprout/predef/version_number.hpp index 4c223357..15d7ce0a 100644 --- a/sprout/predef/version_number.hpp +++ b/sprout/predef/version_number.hpp @@ -14,7 +14,7 @@ // SPROUT_VERSION_NUMBER // #define SPROUT_VERSION_NUMBER(MAJOR, MINOR, PATCH) \ - ( (((MAJOR) % 100) * 10000000) + (((MINOR) % 100) * 100000) + ((PATCH) % 100000) ) + ( (((MAJOR) % 100) * 10000000) + (((MINOR) % 100) * 100000) + ((PATCH) % 100000) ) // // SPROUT_VERSION_NUMBER_MAX @@ -22,19 +22,19 @@ // SPROUT_VERSION_NUMBER_ZERO // #define SPROUT_VERSION_NUMBER_MAX \ - SPROUT_VERSION_NUMBER(99, 99, 99999) + SPROUT_VERSION_NUMBER(99, 99, 99999) #define SPROUT_VERSION_NUMBER_MIN \ - SPROUT_VERSION_NUMBER(0, 0, 1) + SPROUT_VERSION_NUMBER(0, 0, 1) #define SPROUT_VERSION_NUMBER_ZERO \ - SPROUT_VERSION_NUMBER(0, 0, 0) + SPROUT_VERSION_NUMBER(0, 0, 0) // // SPROUT_VERSION_NUMBER_AVAILABLE // SPROUT_VERSION_NUMBER_NOT_AVAILABLE // #define SPROUT_VERSION_NUMBER_AVAILABLE \ - SPROUT_VERSION_NUMBER_MIN + SPROUT_VERSION_NUMBER_MIN #define SPROUT_VERSION_NUMBER_NOT_AVAILABLE \ - SPROUT_VERSION_NUMBER_ZERO + SPROUT_VERSION_NUMBER_ZERO #endif // #ifndef SPROUT_PREDEF_OS_BSD_BSDI_HPP diff --git a/sprout/utility/implicit_cast.hpp b/sprout/utility/implicit_cast.hpp index a3f2d797..0ff0ee0f 100644 --- a/sprout/utility/implicit_cast.hpp +++ b/sprout/utility/implicit_cast.hpp @@ -18,7 +18,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR T implicit_cast(typename sprout::identity::type t) { - return t; + return t; } } // namespace sprout diff --git a/sprout/workaround/std/cstddef.hpp b/sprout/workaround/std/cstddef.hpp index 151b3846..a1baad85 100644 --- a/sprout/workaround/std/cstddef.hpp +++ b/sprout/workaround/std/cstddef.hpp @@ -12,7 +12,7 @@ #include #if defined(__clang__) && defined(__GLIBCXX__) -# if SPROUT_CLANG_EARLIER(3, 4, 2) && (__GLIBCXX__ >= 20140422) +# if SPROUT_CLANG_EARLIER(3, 4, 2) && (__GLIBCXX__ >= 20140422) # include # # if defined(__STDDEF_H) @@ -21,7 +21,7 @@ struct max_align_t { long double __max_align_ld __attribute__((__aligned__(__alignof__(long double)))); }; # endif -# endif +# endif #endif #include