diff options
Diffstat (limited to 'node')
| -rw-r--r-- | node/Hashtable.hpp | 2 | ||||
| -rw-r--r-- | node/Path.hpp | 2 | ||||
| -rw-r--r-- | node/Utils.hpp | 9 |
3 files changed, 6 insertions, 7 deletions
diff --git a/node/Hashtable.hpp b/node/Hashtable.hpp index 58dc8fca..777e88dc 100644 --- a/node/Hashtable.hpp +++ b/node/Hashtable.hpp @@ -105,7 +105,7 @@ public: Hashtable *_ht; _Bucket *_b; }; - friend class Hashtable::Iterator; + //friend class Hashtable<K,V>::Iterator; /** * @param bc Initial capacity in buckets (default: 64, must be nonzero) diff --git a/node/Path.hpp b/node/Path.hpp index 3d468ad9..e12328ff 100644 --- a/node/Path.hpp +++ b/node/Path.hpp @@ -158,7 +158,7 @@ public: /** * @return Local socket as specified by external code */ - inline const int64_t localSocket() const { return _localSocket; } + inline int64_t localSocket() const { return _localSocket; } /** * @return Physical address diff --git a/node/Utils.hpp b/node/Utils.hpp index 1b2b65aa..a24f2c9a 100644 --- a/node/Utils.hpp +++ b/node/Utils.hpp @@ -41,8 +41,8 @@ #include "Constants.hpp" #ifdef __LINUX__ - -#if (defined(_MSC_VER) || defined(__GNUC__)) && (defined(__amd64) || defined(__amd64__) || defined(__x86_64) || defined(__x86_64__) || defined(__AMD64) || defined(__AMD64__) || defined(_M_X64)) +//#if (defined(_MSC_VER) || defined(__GNUC__)) && (defined(__amd64) || defined(__amd64__) || defined(__x86_64) || defined(__x86_64__) || defined(__AMD64) || defined(__AMD64__) || defined(_M_X64)) +#if 0 #include <emmintrin.h> static inline void ZT_FAST_MEMCPY(void *a,const void *b,unsigned long k) { @@ -62,8 +62,8 @@ static inline void ZT_FAST_MEMCPY(void *a,const void *b,unsigned long k) k -= 64; } while (k >= 16) { - __m128 t1 = _mm_loadu_si128(reinterpret_cast<const __m128i *>(bb)); - _mm_storeu_si128(reinterpret_cast<__m128i *>(aa),t1); + __m128 t1 = _mm_loadu_ps(reinterpret_cast<const float *>(bb)); + _mm_storeu_ps(reinterpret_cast<float *>(aa),t1); bb += 16; aa += 16; k -= 16; @@ -74,7 +74,6 @@ static inline void ZT_FAST_MEMCPY(void *a,const void *b,unsigned long k) #else #define ZT_FAST_MEMCPY(a,b,c) memcpy(a,b,c) #endif - #else #define ZT_FAST_MEMCPY(a,b,c) memcpy(a,b,c) #endif |