Windows fixes, compiling using Visual Studio 2015

Author: Giovanny Gutiérrez

raftinc/allocate.hpp

@@ -40,7 +40,7 @@
  * that reference the alignments.
  */
 
-#if defined __AVX__ || __AVX2__
+#if defined __AVX__ || __AVX2__ || _WIN64
 #define ALLOC_ALIGN_WIDTH 32
 #else
 #define ALLOC_ALIGN_WIDTH 16

raftinc/blocked.hpp

@@ -22,11 +22,50 @@
 #include <cstdint>
 #include <cassert>
 
+#ifdef _MSC_VER
+#    if (_MSC_VER >= 1800)
+#        define __alignas_is_defined 1
+#    endif
+#    if (_MSC_VER >= 1900)
+#        define __alignof_is_defined 1
+#    endif
+#else
+#    include <cstdalign>   // __alignas/of_is_defined directly from the implementation
+#endif
+
+
+#ifdef __alignas_is_defined
+#    define ALIGN(X) alignas(X)
+#else
+#    pragma message("C++11 alignas unsupported :( Falling back to compiler attributes")
+#    ifdef __GNUG__
+#        define ALIGN(X) __attribute__ ((aligned(X)))
+#    elif defined(_MSC_VER)
+#        define ALIGN(X) __declspec(align(X))
+#    else
+#        error Unknown compiler, unknown alignment attribute!
+#    endif
+#endif
+
+#ifdef __alignof_is_defined
+#    define ALIGNOF(X) alignof(x)
+#else
+#    pragma message("C++11 alignof unsupported :( Falling back to compiler attributes")
+#    ifdef __GNUG__
+#        define ALIGNOF(X) __alignof__ (X)
+#    elif defined(_MSC_VER)
+#        define ALIGNOF(X) __alignof(X)
+#    else
+#        error Unknown compiler, unknown alignment attribute!
+#    endif
+#endif
+
+
 /**
  * FIXME...should probably align these to cache line then 
  * zero extend pad for producer/consumer.
  */
-struct Blocked
+struct ALIGN(64) Blocked
 {
     using value_type = std::uint32_t;
     using whole_type = std::uint64_t;
@@ -59,9 +98,7 @@ struct Blocked
 
     char pad[ L1D_CACHE_LINE_SIZE - sizeof( whole_type ) ]; 
 }
-#if __APPLE__ || __linux
-__attribute__ (( aligned( 64 )))
-#endif
+
 ;
 
 #endif /* END _BLOCKED_HPP_ */

raftinc/bufferdata.tcc

@@ -96,8 +96,7 @@ template < class T > struct Data< T,
       }
 #elif (defined _WIN64 ) || (defined _WIN32) 
 //FIXME, we need to test this on Win sys before making live    
-      (this)->store = reinterpret_cast< T* >(  _aligned_malloc( align, 
-                                                                (this)->length_store ) );
+      (this)->store = reinterpret_cast< T* >(  _aligned_malloc( (this)->length_store,align) );
 #else
       /** 
        * would use the array allocate, but well...we'd have to 
@@ -171,7 +170,11 @@ template < class T > struct Data< T,
       //FREE USED HERE
       if( ! (this)->external_alloc )
       {
+#if (defined _WIN64 ) || (defined _WIN32) 
+		 _aligned_free( (this)->store );
+#else
          free( (this)->store );
+#endif
       }
       free( (this)->signal );
    }
@@ -227,8 +230,7 @@ template < class T >
       }
 #elif (defined _WIN64 ) || (defined _WIN32) 
 //FIXME, we need to test this on Win sys before making live    
-      (this)->store = reinterpret_cast< type_t* >(  _aligned_malloc( align, 
-                                                                    (this)->length_store ) );
+      (this)->store = reinterpret_cast< type_t* >(  _aligned_malloc((this)->length_store, align));
 #else
       /** 
        * would use the array allocate, but well...we'd have to 
@@ -295,7 +297,11 @@ template < class T >
       //FREE USED HERE
       if( ! (this)->external_alloc )
       {
+#if (defined _WIN64 ) || (defined _WIN32) 
+		  _aligned_free( (this)->store );
+#else
          free( (this)->store );
+#endif
       }
       free( (this)->signal );
    }