From de03d7bab39e70d45885dc03ce67bac0aab4e9f9 Mon Sep 17 00:00:00 2001
From: Diy Upstream <kwrobot@kitware.com>
Date: Wed, 24 Jun 2020 15:33:53 -0400
Subject: [PATCH] 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             | 2 +-
 include/vtkmdiy/master.hpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 52113306b..35c41f6f3 100644
--- a/CMakeLists.txt
+++ b/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
diff --git a/include/vtkmdiy/master.hpp b/include/vtkmdiy/master.hpp
index 716948446..bff1cafa0 100644
--- a/include/vtkmdiy/master.hpp
+++ b/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)
           {