diy 2020-06-24 (ab765e66)

Code extracted from:

    https://gitlab.kitware.com/third-party/diy2.git

at commit ab765e66fec50860e374230be470a38d304c4973 (for/vtk-m-20200626-master).

CMakeLists.txt

@@ -59,7 +59,7 @@ set (diy_libraries "")
 # Debugging
 if                          (${CMAKE_BUILD_TYPE} STREQUAL "Debug" OR
                              ${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo")
-    list (APPEND diy_definitions "-DDEBUG")
+    list (APPEND diy_definitions "-DVTKMDIY_DEBUG")
 endif                       ()
 
 # Logging

include/vtkmdiy/master.hpp

@@ -1143,7 +1143,7 @@ void
 diy::Master::
 flush(bool remote)
 {
-#ifdef DEBUG
+#ifdef VTKMDIY_DEBUG
   time_type start = get_time();
   unsigned wait = 1;
 #endif
@@ -1163,7 +1163,7 @@ flush(bool remote)
       {
           comm_exchange(gid_order);
 
-#ifdef DEBUG
+#ifdef VTKMDIY_DEBUG
           time_type cur = get_time();
           if (cur - start > wait*1000)
           {