update to Vc 0.7.3-dev

[u/mrichter/AliRoot.git] / Vc / include / Vc / sse / helperimpl.h

diff --git a/Vc/include/Vc/sse/helperimpl.h b/Vc/include/Vc/sse/helperimpl.h
index da9e9b3d8b91de09395ff61a80d0375147732b83..49dde10b79a3fe4ea649d2ace6622f4174176df8 100644 (file)
--- a/Vc/include/Vc/sse/helperimpl.h
+++ b/Vc/include/Vc/sse/helperimpl.h
@@ -22,6 +22,7 @@
 
 #include "macros.h"
 
+namespace AliRoot {
 namespace Vc
 {
 namespace Internal
@@ -57,30 +58,30 @@ template<> struct HelperImpl<Vc::SSE2Impl>
 
     template<typename A> static void deinterleave(ushort_v &, ushort_v &, const unsigned short *, A);
 
-    static inline ALWAYS_INLINE_L void prefetchForOneRead(const void *addr) ALWAYS_INLINE_R;
-    static inline ALWAYS_INLINE_L void prefetchForModify(const void *addr) ALWAYS_INLINE_R;
-    static inline ALWAYS_INLINE_L void prefetchClose(const void *addr) ALWAYS_INLINE_R;
-    static inline ALWAYS_INLINE_L void prefetchMid(const void *addr) ALWAYS_INLINE_R;
-    static inline ALWAYS_INLINE_L void prefetchFar(const void *addr) ALWAYS_INLINE_R;
+    static Vc_ALWAYS_INLINE_L void prefetchForOneRead(const void *addr) Vc_ALWAYS_INLINE_R;
+    static Vc_ALWAYS_INLINE_L void prefetchForModify(const void *addr) Vc_ALWAYS_INLINE_R;
+    static Vc_ALWAYS_INLINE_L void prefetchClose(const void *addr) Vc_ALWAYS_INLINE_R;
+    static Vc_ALWAYS_INLINE_L void prefetchMid(const void *addr) Vc_ALWAYS_INLINE_R;
+    static Vc_ALWAYS_INLINE_L void prefetchFar(const void *addr) Vc_ALWAYS_INLINE_R;
 
     template<Vc::MallocAlignment A>
-    static inline ALWAYS_INLINE_L void *malloc(size_t n) ALWAYS_INLINE_R;
-    static inline ALWAYS_INLINE_L void free(void *p) ALWAYS_INLINE_R;
+    static Vc_ALWAYS_INLINE_L void *malloc(size_t n) Vc_ALWAYS_INLINE_R;
+    static Vc_ALWAYS_INLINE_L void free(void *p) Vc_ALWAYS_INLINE_R;
 };
 
 template<> struct HelperImpl<SSE3Impl> : public HelperImpl<SSE2Impl> {};
 template<> struct HelperImpl<SSSE3Impl> : public HelperImpl<SSE3Impl> {};
 template<> struct HelperImpl<SSE41Impl> : public HelperImpl<SSSE3Impl> {};
 template<> struct HelperImpl<SSE42Impl> : public HelperImpl<SSE41Impl> {};
-template<> struct HelperImpl<SSE4aImpl> : public HelperImpl<SSE3Impl> {};
 
 
 } // namespace Internal
 } // namespace Vc
+} // namespace AliRoot
 
-#include "undomacros.h"
 #include "deinterleave.tcc"
 #include "prefetches.tcc"
 #include "helperimpl.tcc"
+#include "undomacros.h"
 
 #endif // VC_SSE_DEINTERLEAVE_H