aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libgomp/ChangeLog7
-rw-r--r--libgomp/openacc.h2
-rw-r--r--libgomp/testsuite/libgomp.oacc-c-c++-common/reduction-4.c2
3 files changed, 9 insertions, 2 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 982e2d3..869adbd 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,10 @@
+2015-05-08 Jason Merrill <jason@redhat.com>
+
+ * testsuite/libgomp.oacc-c-c++-common/reduction-4.c (main): Use
+ _Complex.
+
+ * openacc.h (__GOACC_NOTHROW): Fix noexcept syntax.
+
2015-05-06 Julian Brown <julian@codesourcery.com>
* oacc-init.c (acc_device_lock): Add explanatory comment.
diff --git a/libgomp/openacc.h b/libgomp/openacc.h
index 33432411..44a1526 100644
--- a/libgomp/openacc.h
+++ b/libgomp/openacc.h
@@ -39,7 +39,7 @@ extern "C" {
#endif
#if __cplusplus >= 201103
-# define __GOACC_NOTHROW noexcept ()
+# define __GOACC_NOTHROW noexcept
#elif __cplusplus
# define __GOACC_NOTHROW throw ()
#else /* Not C++ */
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/reduction-4.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/reduction-4.c
index d7da19e..eab2428 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/reduction-4.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/reduction-4.c
@@ -14,7 +14,7 @@ main(void)
{
const int n = 1000;
int i;
- double complex vresult, result, array[n];
+ double _Complex vresult, result, array[n];
bool lvresult, lresult;
for (i = 0; i < n; i++)