Merge namespace scopes in eval.c

The big deletion patch left some identical namespace scopes sitting
next to one another.  This patch removes the redundant "namespace
expr"s.

gdb/ChangeLog
2021-03-08  Tom Tromey  <tom@tromey.com>

	* eval.c: Merge "namespace" scopes.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 212f61da4852be1f45c869bea86eb946043bf784..b69e7ae77294b724e70a68220e8f9a01234f621f 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2021-03-08  Tom Tromey  <tom@tromey.com>
+
+       * eval.c: Merge "namespace" scopes.
+
 2021-03-08  Tom Tromey  <tom@tromey.com>
 
        * parser-defs.h (struct expr_builder) <expr_builder>: Inline.

diff --git a/gdb/eval.c b/gdb/eval.c
index 4c602235862716a6124b599ca969343bc71dda76..3ea814f067766f1bfaa0055889401b71d2898c54 100644 (file)
--- a/gdb/eval.c
+++ b/gdb/eval.c
@@ -2639,11 +2639,6 @@ unop_memval_type_operation::evaluate_for_address (struct expression *exp,
                     std::get<1> (m_storage)->evaluate (nullptr, exp, noside));
 }
 
-}
-
-namespace expr
-{
-
 value *
 var_value_operation::evaluate_for_address (struct expression *exp,
                                           enum noside noside)
@@ -2826,11 +2821,6 @@ var_value_operation::evaluate_for_sizeof (struct expression *exp,
   return evaluate_subexp_for_sizeof_base (exp, type);
 }
 
-}
-
-namespace expr
-{
-
 value *
 var_msym_value_operation::evaluate_for_cast (struct type *to_type,
                                             struct expression *exp,