diff options
author | Erik Schnetter <schnetter@gmail.com> | 2013-07-06 17:19:40 -0400 |
---|---|---|
committer | Erik Schnetter <schnetter@gmail.com> | 2013-07-06 17:19:40 -0400 |
commit | d4b78995d8ef3364dcc1437089bc967f888ba67d (patch) | |
tree | 2052741be6e4544f4aa9567558070055b90b71dd /vec_sse_float4.h | |
parent | 8b4229381b4cc4d09f62f921c2017a2bc03c32e7 (diff) | |
download | vecmathlib-d4b78995d8ef3364dcc1437089bc967f888ba67d.zip vecmathlib-d4b78995d8ef3364dcc1437089bc967f888ba67d.tar.gz |
Do not require C++11 any more
Do not use any C++11-specific features, such as the auto keyword.
Use C99 math functions when C++11 is not available.
Diffstat (limited to 'vec_sse_float4.h')
-rw-r--r-- | vec_sse_float4.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/vec_sse_float4.h b/vec_sse_float4.h index b514146..b50b812 100644 --- a/vec_sse_float4.h +++ b/vec_sse_float4.h @@ -651,26 +651,26 @@ namespace vecmathlib { // boolvec definitions - inline - auto boolvec<float,4>::as_int() const -> intvec_t + inline boolvec<float,4>::intvec_t boolvec<float,4>::as_int() const { return _mm_castps_si128(v); } - inline - auto boolvec<float,4>::convert_int() const -> intvec_t + inline boolvec<float,4>::intvec_t boolvec<float,4>::convert_int() const { return lsr(as_int(), bits-1); } inline - auto boolvec<float,4>::ifthen(intvec_t x, intvec_t y) const -> intvec_t + boolvec<float,4>::intvec_t boolvec<float,4>::ifthen(intvec_t x, intvec_t y) + const { return ifthen(x.as_float(), y.as_float()).as_int(); } inline - auto boolvec<float,4>::ifthen(realvec_t x, realvec_t y) const -> realvec_t + boolvec<float,4>::realvec_t boolvec<float,4>::ifthen(realvec_t x, realvec_t y) + const { #ifdef __SSE4_1__ return _mm_blendv_ps(y.v, x.v, v); @@ -684,12 +684,12 @@ namespace vecmathlib { // intvec definitions - inline auto intvec<float,4>::as_float() const -> realvec_t + inline intvec<float,4>::realvec_t intvec<float,4>::as_float() const { return _mm_castsi128_ps(v); } - inline auto intvec<float,4>::convert_float() const -> realvec_t + inline intvec<float,4>::realvec_t intvec<float,4>::convert_float() const { return _mm_cvtepi32_ps(v); } |