summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2019-03-19 03:39:30 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2019-03-19 03:39:30 (GMT)
commit604b67df19a164824b74fba0aa5e489b5a64d1ae (patch)
tree4f22e35696e7f93856842b01f9979cc927b64e00
parentc50b7c4b7eee19db919fbccfe9ef6a7599aff5c4 (diff)
parent2e867d2a6dd5f330011f20333064aa0c12464d59 (diff)
downloadhdf5-604b67df19a164824b74fba0aa5e489b5a64d1ae.zip
hdf5-604b67df19a164824b74fba0aa5e489b5a64d1ae.tar.gz
hdf5-604b67df19a164824b74fba0aa5e489b5a64d1ae.tar.bz2
Merge pull request #1607 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop to develop
* commit '2e867d2a6dd5f330011f20333064aa0c12464d59': Commented out memcpy overlap check while we investigate parallel filters issues.
-rw-r--r--src/H5MM.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/H5MM.c b/src/H5MM.c
index 0be0e5d..1a5a149 100644
--- a/src/H5MM.c
+++ b/src/H5MM.c
@@ -589,7 +589,12 @@ H5MM_memcpy(void *dest, const void *src, size_t n)
HDassert(dest);
HDassert(src);
+#if 0
+ /* Commented out while we investigate overlapping buffers in the
+ * parallel filter code (HDFFV-10735).
+ */
HDassert((char *)dest >= (const char *)src + n || (const char *)src >= (char *)dest + n);
+#endif
ret = HDmemcpy(dest, src, n);