From 17795822b27b7b5381525b1d7c98ca181be9bc80 Mon Sep 17 00:00:00 2001
From: Trevor Saunders <tbsaunde@tbsaunde.org>
Date: Wed, 12 Aug 2015 20:09:33 +0000
Subject: Revert "replace several uses of the anon namespace with GCC_FINAL"

This reverts commit daa5a8a3cf9b04cd9af5544c61e12e6dca14f870.

From-SVN: r226834
---
 gcc/omp-low.c | 40 ++++++++++++++++++++++++++++++----------
 1 file changed, 30 insertions(+), 10 deletions(-)

(limited to 'gcc/omp-low.c')

diff --git a/gcc/omp-low.c b/gcc/omp-low.c
index 57d585a..c1dc919 100644
--- a/gcc/omp-low.c
+++ b/gcc/omp-low.c
@@ -9529,7 +9529,9 @@ execute_expand_omp (void)
 
 /* OMP expansion -- the default pass, run before creation of SSA form.  */
 
-static const pass_data pass_data_expand_omp =
+namespace {
+
+const pass_data pass_data_expand_omp =
 {
   GIMPLE_PASS, /* type */
   "ompexp", /* name */
@@ -9542,7 +9544,7 @@ static const pass_data pass_data_expand_omp =
   0, /* todo_flags_finish */
 };
 
-class pass_expand_omp GCC_FINAL : public gimple_opt_pass
+class pass_expand_omp : public gimple_opt_pass
 {
 public:
   pass_expand_omp (gcc::context *ctxt)
@@ -9566,13 +9568,17 @@ public:
 
 }; // class pass_expand_omp
 
+} // anon namespace
+
 gimple_opt_pass *
 make_pass_expand_omp (gcc::context *ctxt)
 {
   return new pass_expand_omp (ctxt);
 }
 
-static const pass_data pass_data_expand_omp_ssa =
+namespace {
+
+const pass_data pass_data_expand_omp_ssa =
 {
   GIMPLE_PASS, /* type */
   "ompexpssa", /* name */
@@ -9585,7 +9591,7 @@ static const pass_data pass_data_expand_omp_ssa =
   TODO_cleanup_cfg | TODO_rebuild_alias, /* todo_flags_finish */
 };
 
-class pass_expand_omp_ssa GCC_FINAL : public gimple_opt_pass
+class pass_expand_omp_ssa : public gimple_opt_pass
 {
 public:
   pass_expand_omp_ssa (gcc::context *ctxt)
@@ -9601,6 +9607,8 @@ public:
 
 }; // class pass_expand_omp_ssa
 
+} // anon namespace
+
 gimple_opt_pass *
 make_pass_expand_omp_ssa (gcc::context *ctxt)
 {
@@ -11944,7 +11952,9 @@ execute_lower_omp (void)
   return 0;
 }
 
-static const pass_data pass_data_lower_omp =
+namespace {
+
+const pass_data pass_data_lower_omp =
 {
   GIMPLE_PASS, /* type */
   "omplower", /* name */
@@ -11957,7 +11967,7 @@ static const pass_data pass_data_lower_omp =
   0, /* todo_flags_finish */
 };
 
-class pass_lower_omp GCC_FINAL : public gimple_opt_pass
+class pass_lower_omp : public gimple_opt_pass
 {
 public:
   pass_lower_omp (gcc::context *ctxt)
@@ -11969,6 +11979,8 @@ public:
 
 }; // class pass_lower_omp
 
+} // anon namespace
+
 gimple_opt_pass *
 make_pass_lower_omp (gcc::context *ctxt)
 {
@@ -12398,7 +12410,9 @@ diagnose_omp_structured_block_errors (void)
   return 0;
 }
 
-static const pass_data pass_data_diagnose_omp_blocks =
+namespace {
+
+const pass_data pass_data_diagnose_omp_blocks =
 {
   GIMPLE_PASS, /* type */
   "*diagnose_omp_blocks", /* name */
@@ -12411,7 +12425,7 @@ static const pass_data pass_data_diagnose_omp_blocks =
   0, /* todo_flags_finish */
 };
 
-class pass_diagnose_omp_blocks GCC_FINAL : public gimple_opt_pass
+class pass_diagnose_omp_blocks : public gimple_opt_pass
 {
 public:
   pass_diagnose_omp_blocks (gcc::context *ctxt)
@@ -12430,6 +12444,8 @@ public:
 
 }; // class pass_diagnose_omp_blocks
 
+} // anon namespace
+
 gimple_opt_pass *
 make_pass_diagnose_omp_blocks (gcc::context *ctxt)
 {
@@ -13691,7 +13707,9 @@ ipa_omp_simd_clone (void)
   return 0;
 }
 
-static const pass_data pass_data_omp_simd_clone =
+namespace {
+
+const pass_data pass_data_omp_simd_clone =
 {
   SIMPLE_IPA_PASS,		/* type */
   "simdclone",			/* name */
@@ -13704,7 +13722,7 @@ static const pass_data pass_data_omp_simd_clone =
   0,				/* todo_flags_finish */
 };
 
-class pass_omp_simd_clone GCC_FINAL : public simple_ipa_opt_pass
+class pass_omp_simd_clone : public simple_ipa_opt_pass
 {
 public:
   pass_omp_simd_clone(gcc::context *ctxt)
@@ -13725,6 +13743,8 @@ pass_omp_simd_clone::gate (function *)
 	  && (targetm.simd_clone.compute_vecsize_and_simdlen != NULL));
 }
 
+} // anon namespace
+
 simple_ipa_opt_pass *
 make_pass_omp_simd_clone (gcc::context *ctxt)
 {
-- 
cgit v1.1