summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorThomas Schwinge <thomas@codesourcery.com>2016-03-17 16:07:54 +0100
committerThomas Schwinge <tschwinge@gcc.gnu.org>2016-03-17 16:07:54 +0100
commit91106e8435c68963f7f0a8e6bf45acb0b2a432ab (patch)
tree34546c9e023cfcd4b03b3aec5fd46fa8dae2a8c3 /include
parentb38ba58bde4cdb7ffd47b56a79d1de819cfe9cea (diff)
Rename GOMP_MAP_FORCE_DEALLOC to GOMP_MAP_DELETE
Also rename the Fortran OMP_MAP_FORCE_DEALLOC to OMP_MAP_DELETE. include/ * gomp-constants.h (enum gomp_map_kind): Rename GOMP_MAP_FORCE_DEALLOC to GOMP_MAP_DELETE. Adjust all users. gcc/fortran/ * gfortran.h (enum gfc_omp_map_op): Rename OMP_MAP_FORCE_DEALLOC to OMP_MAP_DELETE. Adjust all users. From-SVN: r234294
Diffstat (limited to 'include')
-rw-r--r--include/ChangeLog5
-rw-r--r--include/gomp-constants.h6
2 files changed, 7 insertions, 4 deletions
diff --git a/include/ChangeLog b/include/ChangeLog
index c48156f9887..d09d54835db 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,8 @@
+2016-03-17 Thomas Schwinge <thomas@codesourcery.com>
+
+ * gomp-constants.h (enum gomp_map_kind): Rename
+ GOMP_MAP_FORCE_DEALLOC to GOMP_MAP_DELETE. Adjust all users.
+
2016-03-03 Than McIntosh <thanm@google.com>
* plugin-api.h: Add new hooks to the plugin transfer vector to
diff --git a/include/gomp-constants.h b/include/gomp-constants.h
index a8e7723b324..e31c2e00364 100644
--- a/include/gomp-constants.h
+++ b/include/gomp-constants.h
@@ -67,7 +67,7 @@ enum gomp_map_kind
/* Must already be present. */
GOMP_MAP_FORCE_PRESENT = (GOMP_MAP_FLAG_SPECIAL_0 | 2),
/* Deallocate a mapping, without copying from device. */
- GOMP_MAP_FORCE_DEALLOC = (GOMP_MAP_FLAG_SPECIAL_0 | 3),
+ GOMP_MAP_DELETE = (GOMP_MAP_FLAG_SPECIAL_0 | 3),
/* Is a device pointer. OMP_CLAUSE_SIZE for these is unused; is implicitly
POINTER_SIZE_UNITS. */
GOMP_MAP_FORCE_DEVICEPTR = (GOMP_MAP_FLAG_SPECIAL_1 | 0),
@@ -125,11 +125,9 @@ enum gomp_map_kind
GOMP_MAP_DELETE_ZERO_LEN_ARRAY_SECTION
= (GOMP_MAP_FLAG_SPECIAL_2
| GOMP_MAP_FLAG_SPECIAL | 3),
- /* OpenMP 4.5 alias for forced deallocation. */
- GOMP_MAP_DELETE = GOMP_MAP_FORCE_DEALLOC,
/* Decrement usage count and deallocate if zero. */
GOMP_MAP_RELEASE = (GOMP_MAP_FLAG_SPECIAL_2
- | GOMP_MAP_FORCE_DEALLOC),
+ | GOMP_MAP_DELETE),
/* Internal to GCC, not used in libgomp. */
/* Do not map, but pointer assign a pointer instead. */