From 9b4434e6e0e2cb35a966a0d699c3046e3848c874 Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Sun, 17 Feb 2019 19:47:20 -1000 Subject: [PATCH] Ensure correct namespace in simd subsystem --- include/zeus/simd/parallelism_v2_simd.hpp | 12 ++++++------ include/zeus/simd/simd.hpp | 16 ++++++++-------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/include/zeus/simd/parallelism_v2_simd.hpp b/include/zeus/simd/parallelism_v2_simd.hpp index 5004a05..883ff74 100644 --- a/include/zeus/simd/parallelism_v2_simd.hpp +++ b/include/zeus/simd/parallelism_v2_simd.hpp @@ -659,7 +659,7 @@ public: #pragma GCC system_header #endif -namespace athena::_simd { +namespace zeus::_simd { enum class _StorageKind { _Scalar, @@ -837,8 +837,8 @@ constexpr bool __vectorizable() { !std::is_same<_Tp, bool>::value; } -} // namespace athena::_simd -namespace athena::_simd::simd_abi { +} // namespace zeus::_simd +namespace zeus::_simd::simd_abi { using scalar = __simd_abi<_StorageKind::_Scalar, 1>; @@ -851,8 +851,8 @@ inline constexpr size_t max_fixed_size = 32; template using compatible = fixed_size<16 / sizeof(_Tp)>; -} // namespace athena::_simd::simd_abi -namespace athena::_simd { +} // namespace zeus::_simd::simd_abi +namespace zeus::_simd { template > class simd; @@ -1528,4 +1528,4 @@ public: void __set(size_t __index, bool __val) noexcept { __storage_.set(__index, __val); } }; -} // namespace athena::_simd +} // namespace zeus::_simd diff --git a/include/zeus/simd/simd.hpp b/include/zeus/simd/simd.hpp index c0d9577..6531af4 100644 --- a/include/zeus/simd/simd.hpp +++ b/include/zeus/simd/simd.hpp @@ -1,10 +1,10 @@ #pragma once -#define _ATHENA_SIMD_INCLUDED +#define _ZEUS_SIMD_INCLUDED #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wignored-attributes" #endif -namespace athena::_simd { +namespace zeus::_simd { using namespace std; } #include "parallelism_v2_simd.hpp" @@ -18,13 +18,13 @@ using namespace std; #else namespace simd_abi { template -struct athena_native {}; +struct zeus_native {}; template <> -struct athena_native { +struct zeus_native { using type = fixed_size<4>; }; template <> -struct athena_native { +struct zeus_native { using type = fixed_size<4>; }; } // namespace simd_abi @@ -32,11 +32,11 @@ struct athena_native { #ifdef __GNUC__ #pragma GCC diagnostic pop #endif -namespace athena { +namespace zeus { template -using simd = _simd::simd::type>; +using simd = _simd::simd::type>; template using simd_values = _simd::simd_data>; using simd_floats = simd_values; using simd_doubles = simd_values; -} // namespace athena +} // namespace zeus