Merge pull request #379 from Dekken/gcc8

GCC8 Werror changes

Author: PhilipDeegan

lib/include/tick/array/abstractarray1d2d.h

@@ -49,6 +49,23 @@ ENABLE_WARNING(delete-non-virtual-dtor, delete-non-virtual-dtor, 42)
 #define INDICE_TYPE std::uint32_t
 #endif
 
+namespace tick {
+template <typename T, typename K>
+class Allocator {
+ public:
+  template <typename Y = T, typename Z = K>
+  static typename std::enable_if<std::is_base_of<std::atomic<Z>, Y>::value>::type memcopy(
+      T *to, const T *from, size_t size) {
+    for (size_t i = 0; i < size; i++) to[i].store(from[i]);
+  }
+  template <typename Y = T, typename Z = K>
+  static typename std::enable_if<!std::is_base_of<std::atomic<Z>, Y>::value>::type memcopy(
+      T *to, T *from, size_t size) {
+    ::memcpy(to, from, sizeof(T) * size);
+  }
+};
+}  // namespace tick
+
 template <typename T>
 struct InnerType {};
 

lib/include/tick/array/abstractarray1d2d/assignment.h

@@ -20,12 +20,14 @@ AbstractArray1d2d<T, MAJ>& AbstractArray1d2d<T, MAJ>::operator=(const AbstractAr
     _size_sparse = other._size_sparse;
     if (other.is_dense()) {
       TICK_PYTHON_MALLOC(_data, T, _size);
-      memcpy(_data, other._data, sizeof(T) * _size);
+      tick::Allocator<T, typename AbstractArray1d2d<T, MAJ>::K>
+        ::memcopy(_data, other._data, _size);
       _indices = nullptr;
     } else {
       if (_size_sparse > 0) {
         TICK_PYTHON_MALLOC(_data, T, _size_sparse);
-        memcpy(_data, other._data, sizeof(T) * _size_sparse);
+        tick::Allocator<T, typename AbstractArray1d2d<T, MAJ>::K>
+          ::memcopy(_data, other._data, _size_sparse);
         TICK_PYTHON_MALLOC(_indices, INDICE_TYPE, _size_sparse);
         memcpy(_indices, other._indices, sizeof(INDICE_TYPE) * _size_sparse);
       }

lib/include/tick/array/abstractarray1d2d/constructor.h

@@ -48,11 +48,13 @@ AbstractArray1d2d<T, MAJ>::AbstractArray1d2d(const AbstractArray1d2d<T, MAJ> &ot
   _data = nullptr;
   if (other.is_dense()) {
     TICK_PYTHON_MALLOC(_data, T, _size);
-    memcpy(_data, other._data, sizeof(T) * _size);
+    tick::Allocator<T, typename AbstractArray1d2d<T, MAJ>::K>
+      ::memcopy(_data, other._data, _size);
     _indices = nullptr;
   } else {
     TICK_PYTHON_MALLOC(_data, T, _size_sparse);
-    memcpy(_data, other._data, sizeof(T) * _size_sparse);
+    tick::Allocator<T, typename AbstractArray1d2d<T, MAJ>::K>
+      ::memcopy(_data, other._data, _size_sparse);
     TICK_PYTHON_MALLOC(_indices, INDICE_TYPE, _size_sparse);
     memcpy(_indices, other._indices, sizeof(INDICE_TYPE) * _size_sparse);
   }
@@ -80,6 +82,4 @@ AbstractArray1d2d<T, MAJ>::AbstractArray1d2d(AbstractArray1d2d<T, MAJ> &&other)
   other._size = 0;
 }
 
-
-
 #endif  // LIB_INCLUDE_TICK_ARRAY_ABSTRACTARRAY1D2D_CONSTRUCTOR_H_