Merge branch 'upstream-diy' into update_diy_to_namespace_DEBUG_define
* upstream-diy: diy 2020-06-24 (ab765e66)
This commit is contained in:
commit
a1680ef8bf
2
vtkm/thirdparty/diy/vtkmdiy/CMakeLists.txt
vendored
2
vtkm/thirdparty/diy/vtkmdiy/CMakeLists.txt
vendored
@ -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
|
||||
|
@ -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)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user