diff options
Diffstat (limited to 'TAO/TAO_IDL/util')
| -rw-r--r-- | TAO/TAO_IDL/util/utl_err.cpp | 28 | ||||
| -rw-r--r-- | TAO/TAO_IDL/util/utl_global.cpp | 4 | ||||
| -rw-r--r-- | TAO/TAO_IDL/util/utl_scope.cpp | 10 |
3 files changed, 21 insertions, 21 deletions
diff --git a/TAO/TAO_IDL/util/utl_err.cpp b/TAO/TAO_IDL/util/utl_err.cpp index fd916fc3ed1..506648e4899 100644 --- a/TAO/TAO_IDL/util/utl_err.cpp +++ b/TAO/TAO_IDL/util/utl_err.cpp @@ -227,7 +227,7 @@ idl_error_header (UTL_Error::ErrorCode c, ACE_CString s) { ACE_ERROR ((LM_ERROR, - "%C: \"%C\", line %d: %C", + "%s: \"%s\", line %d: %s", idl_global->prog_name (), s.c_str (), lineno == -1 ? idl_global->lineno () : lineno, @@ -629,7 +629,7 @@ UTL_Error::syntax_error (IDL_GlobalData::ParseState ps) idl_global->lineno (), idl_global->filename ()->get_string ()); ACE_ERROR ((LM_ERROR, - "%C\n", + "%s\n", parse_state_to_error_message (ps))); // Better to bail here than to increment the error count and @@ -780,7 +780,7 @@ UTL_Error::coercion_error (AST_Expression *v, v->file_name ()->get_string ()); v->dump (*ACE_DEFAULT_LOG_STREAM); ACE_ERROR ((LM_ERROR, - " to %C\n", + " to %s\n", exprtype_to_string (t))); idl_global->set_err_count (idl_global->err_count () + 1); } @@ -806,7 +806,7 @@ UTL_Error::version_number_error (char *n) idl_global->lineno (), idl_global->filename ()->get_string ()); ACE_ERROR ((LM_ERROR, - "%C\n", + "%s\n", n)); idl_global->set_err_count (idl_global->err_count () + 1); } @@ -818,7 +818,7 @@ UTL_Error::version_syntax_error (const char *msg) idl_global->lineno (), idl_global->filename ()->get_string ()); ACE_ERROR ((LM_ERROR, - "%C\n", + "%s\n", msg)); idl_global->set_err_count (idl_global->err_count () + 1); } @@ -1152,7 +1152,7 @@ UTL_Error::enum_val_expected (AST_Union *u, u->line (), u->file_name ()); ACE_ERROR ((LM_ERROR, - " union %C, ", + " union %s, ", u->local_name ()->get_string ())); l->dump (*ACE_DEFAULT_LOG_STREAM); ACE_ERROR ((LM_ERROR, @@ -1174,7 +1174,7 @@ UTL_Error::enum_val_lookup_failure (AST_Union *u, u->line (), u->file_name ()); ACE_ERROR ((LM_ERROR, - " union %C, enum %C, enumerator ", + " union %s, enum %s, enumerator ", u->local_name ()->get_string (), e->local_name ()->get_string ())); n->dump (*ACE_DEFAULT_LOG_STREAM); @@ -1206,7 +1206,7 @@ UTL_Error::name_case_error (char *b, idl_global->lineno (), idl_global->filename ()->get_string ()); ACE_ERROR ((LM_ERROR, - "\"%C\" and \"%C\"\n", + "\"%s\" and \"%s\"\n", b, n)); idl_global->set_err_count (idl_global->err_count () + 1); @@ -1222,7 +1222,7 @@ UTL_Error::name_case_warning (char *b, idl_global->lineno (), idl_global->filename ()->get_string ()); ACE_ERROR ((LM_ERROR, - "\"%C\" and \"%C\"\n", + "\"%s\" and \"%s\"\n", b, n)); } @@ -1235,7 +1235,7 @@ UTL_Error::idl_keyword_error (char *n) idl_global->lineno (), idl_global->filename ()->get_string ()); ACE_ERROR ((LM_ERROR, - "\"%C\"\n", + "\"%s\"\n", n)); idl_global->set_err_count (idl_global->err_count () + 1); } @@ -1249,7 +1249,7 @@ UTL_Error::idl_keyword_warning (char *n) idl_global->lineno (), idl_global->filename ()->get_string ()); ACE_ERROR ((LM_ERROR, - "\"%C\"\n", + "\"%s\"\n", n)); } } @@ -1264,12 +1264,12 @@ UTL_Error::ambiguous (UTL_Scope *s, d->line (), d->file_name ()); ACE_ERROR ((LM_ERROR, - " scope: %C, collision: ", + " scope: %s, collision: ", (ScopeAsDecl (s))->local_name ()->get_string ())); - d->name ()->dump (*ACE_DEFAULT_LOG_STREAM); + d->name ()->dump (*ACE_DEFAULT_LOG_STREAM);; ACE_ERROR ((LM_ERROR, " vs. ")); - l->name ()->dump (*ACE_DEFAULT_LOG_STREAM); + l->name ()->dump (*ACE_DEFAULT_LOG_STREAM);; ACE_ERROR ((LM_ERROR, "\n")); idl_global->set_err_count (idl_global->err_count () + 1); diff --git a/TAO/TAO_IDL/util/utl_global.cpp b/TAO/TAO_IDL/util/utl_global.cpp index fe3d381320f..68d05df6e0d 100644 --- a/TAO/TAO_IDL/util/utl_global.cpp +++ b/TAO/TAO_IDL/util/utl_global.cpp @@ -1799,7 +1799,7 @@ IDL_GlobalData::add_dcps_data_type (const char* id) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Unable to insert type") - ACE_TEXT (" into DCPS type container: %C.\n"), + ACE_TEXT (" into DCPS type container: %s.\n"), id)); return; } @@ -1807,7 +1807,7 @@ IDL_GlobalData::add_dcps_data_type (const char* id) else { ACE_ERROR ((LM_WARNING, - ACE_TEXT ("(%P|%t) Duplicate DCPS type defined: %C.\n"), + ACE_TEXT ("(%P|%t) Duplicate DCPS type defined: %s.\n"), id)); } diff --git a/TAO/TAO_IDL/util/utl_scope.cpp b/TAO/TAO_IDL/util/utl_scope.cpp index 5314801b0f7..4373cea7356 100644 --- a/TAO/TAO_IDL/util/utl_scope.cpp +++ b/TAO/TAO_IDL/util/utl_scope.cpp @@ -1835,7 +1835,7 @@ UTL_Scope::lookup_by_name (UTL_ScopedName *e, if (0 != d) { ACE_ERROR (( LM_ERROR, - ACE_TEXT ("%C: \"%C\", line %d: Did you mean \"::%C\"\n") + ACE_TEXT ("%s: \"%s\", line %d: Did you mean \"::%s\"\n") ACE_TEXT (" declared at "), idl_global->prog_name (), idl_global->filename ()->get_string (), @@ -1848,7 +1848,7 @@ UTL_Scope::lookup_by_name (UTL_ScopedName *e, if (!same_file) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%C "), + ACE_TEXT ("%s "), d->file_name ().c_str () )); } ACE_ERROR ((LM_ERROR, @@ -1856,11 +1856,11 @@ UTL_Scope::lookup_by_name (UTL_ScopedName *e, d->line () )); if (ScopeAsDecl (this)->full_name ()[0]) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("::%C"), + ACE_ERROR ((LM_ERROR, ACE_TEXT ("::%s"), ScopeAsDecl (this)->full_name () )); } ACE_ERROR ((LM_ERROR, - ACE_TEXT ("::%C\""), + ACE_TEXT ("::%s\""), e->head ()->get_string () )); const bool same_file_again= (same_file && @@ -1871,7 +1871,7 @@ UTL_Scope::lookup_by_name (UTL_ScopedName *e, { ACE_ERROR ((LM_ERROR, ACE_TEXT ("\n") - ACE_TEXT (" declared at %C "), + ACE_TEXT (" declared at %s "), first_one_found->file_name ().c_str () )); } else |