aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp/cxx-pretty-print.c
diff options
context:
space:
mode:
authorGabriel Dos Reis <gdr@integrable-solutions.net>2013-08-25 05:51:54 +0000
committerGabriel Dos Reis <gdr@gcc.gnu.org>2013-08-25 05:51:54 +0000
commit0691175fe28c07b0dd6f619bbb9a20a0e1f055b7 (patch)
tree42cae0fae566df7b683d8856116dd9f221c827ed /gcc/cp/cxx-pretty-print.c
parent66dfe4c4f83eb1a3f42083251c989f271fa3b5cf (diff)
downloadgcc-0691175fe28c07b0dd6f619bbb9a20a0e1f055b7.zip
gcc-0691175fe28c07b0dd6f619bbb9a20a0e1f055b7.tar.gz
gcc-0691175fe28c07b0dd6f619bbb9a20a0e1f055b7.tar.bz2
c-pretty-print.h (c_pretty_printer::translate_string): Declare.
c-family/ * c-pretty-print.h (c_pretty_printer::translate_string): Declare. * c-pretty-print.c (M_): Remove. (c_pretty_printer::translate_string): Define. (pp_c_type_specifier): Use it. (pp_c_primary_expression): Likewise. (pp_c_expression): Likewise. cp/ * cxx-pretty-print.c (M_): Remove. (pp_cxx_unqualified_id): Use translate_string instead of M_. (pp_cxx_canonical_template_parameter): Likewise. From-SVN: r201974
Diffstat (limited to 'gcc/cp/cxx-pretty-print.c')
-rw-r--r--gcc/cp/cxx-pretty-print.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/gcc/cp/cxx-pretty-print.c b/gcc/cp/cxx-pretty-print.c
index dcebe0b..6e3b2ad 100644
--- a/gcc/cp/cxx-pretty-print.c
+++ b/gcc/cp/cxx-pretty-print.c
@@ -27,10 +27,6 @@ along with GCC; see the file COPYING3. If not see
#include "cxx-pretty-print.h"
#include "tree-pretty-print.h"
-/* Translate if being used for diagnostics, but not for dump files or
- __PRETTY_FUNCTION. */
-#define M_(msgid) (pp_translate_identifiers (pp) ? _(msgid) : (msgid))
-
static void pp_cxx_unqualified_id (cxx_pretty_printer *, tree);
static void pp_cxx_nested_name_specifier (cxx_pretty_printer *, tree);
static void pp_cxx_qualified_id (cxx_pretty_printer *, tree);
@@ -149,7 +145,7 @@ pp_cxx_unqualified_id (cxx_pretty_printer *pp, tree t)
switch (code)
{
case RESULT_DECL:
- pp_cxx_ws_string (pp, M_("<return-value>"));
+ pp->translate_string ("<return-value>");
break;
case OVERLOAD:
@@ -168,7 +164,7 @@ pp_cxx_unqualified_id (cxx_pretty_printer *pp, tree t)
case IDENTIFIER_NODE:
if (t == NULL)
- pp_cxx_ws_string (pp, M_("<unnamed>"));
+ pp->translate_string ("<unnamed>");
else if (IDENTIFIER_TYPENAME_P (t))
pp_cxx_conversion_function_id (pp, t);
else
@@ -2154,7 +2150,7 @@ pp_cxx_canonical_template_parameter (cxx_pretty_printer *pp, tree parm)
parm = TEMPLATE_TYPE_PARM_INDEX (parm);
pp_cxx_begin_template_argument_list (pp);
- pp_cxx_ws_string (pp, M_("template-parameter-"));
+ pp->translate_string ("template-parameter-");
pp_wide_integer (pp, TEMPLATE_PARM_LEVEL (parm));
pp_minus (pp);
pp_wide_integer (pp, TEMPLATE_PARM_IDX (parm) + 1);